This is a note to let you know that I've just added the patch titled
netfilter: nftables: statify nft_parse_register()
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-nftables-statify-nft_parse_register.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 08a01c11a5bb3de9b0a9c9b2685867e50eda9910 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Date: Mon, 25 Jan 2021 23:19:17 +0100
Subject: netfilter: nftables: statify nft_parse_register()
From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
commit 08a01c11a5bb3de9b0a9c9b2685867e50eda9910 upstream.
This function is not used anymore by any extension, statify it.
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/net/netfilter/nf_tables.h | 1 -
net/netfilter/nf_tables_api.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -205,7 +205,6 @@ static inline enum nft_registers nft_typ
}
int nft_parse_u32_check(const struct nlattr *attr, int max, u32 *dest);
-unsigned int nft_parse_register(const struct nlattr *attr);
int nft_dump_register(struct sk_buff *skb, unsigned int attr, unsigned int reg);
int nft_parse_register_load(const struct nlattr *attr, u8 *sreg, u32 len);
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8492,7 +8492,7 @@ EXPORT_SYMBOL_GPL(nft_parse_u32_check);
* Registers used to be 128 bit wide, these register numbers will be
* mapped to the corresponding 32 bit register numbers.
*/
-unsigned int nft_parse_register(const struct nlattr *attr)
+static unsigned int nft_parse_register(const struct nlattr *attr)
{
unsigned int reg;
@@ -8504,7 +8504,6 @@ unsigned int nft_parse_register(const st
return reg + NFT_REG_SIZE / NFT_REG32_SIZE - NFT_REG32_00;
}
}
-EXPORT_SYMBOL_GPL(nft_parse_register);
/**
* nft_dump_register - dump a register value to a netlink attribute
Patches currently in stable-queue which might be from pablo@xxxxxxxxxxxxx are
queue-5.10/ipvs-align-inner_mac_header-for-encapsulation.patch
queue-5.10/netfilter-nf_tables-disallow-element-updates-of-boun.patch
queue-5.10/netfilter-nf_tables-validate-registers-coming-from-userspace.patch
queue-5.10/netfilter-nfnetlink_osf-fix-module-autoload.patch
queue-5.10/netfilter-nf_tables-hold-mutex-on-netns-pre_exit-path.patch
queue-5.10/netfilter-nftables-statify-nft_parse_register.patch
queue-5.10/netfilter-nft_set_pipapo-.walk-does-not-deal-with-ge.patch
