From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, stable@vger.kernel.org, sashal@kernel.org
Subject: [PATCH -stable,4.14 03/11] netfilter: nftables: statify nft_parse_register()
Date: Sat, 27 May 2023 18:08:03 +0200 [thread overview]
Message-ID: <20230527160811.67779-4-pablo@netfilter.org> (raw)
In-Reply-To: <20230527160811.67779-1-pablo@netfilter.org>
[ 08a01c11a5bb3de9b0a9c9b2685867e50eda9910 ]
This function is not used anymore by any extension, statify it.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/net/netfilter/nf_tables.h | 1 -
net/netfilter/nf_tables_api.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index e837bf96c6a3..8397f859ff70 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -195,7 +195,6 @@ static inline enum nft_registers nft_type_to_reg(enum nft_data_types type)
}
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);
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 3adefb2a625c..95ca28a732c7 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5624,7 +5624,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;
@@ -5636,7 +5636,6 @@ unsigned int nft_parse_register(const struct nlattr *attr)
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
--
2.30.2
next prev parent reply other threads:[~2023-05-27 15:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-27 16:08 [PATCH -stable,4.14 00/11] more stable fixes for 4.14 Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 01/11] netfilter: nftables: add nft_parse_register_load() and use it Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 02/11] netfilter: nftables: add nft_parse_register_store() " Pablo Neira Ayuso
2023-05-27 16:08 ` Pablo Neira Ayuso [this message]
2023-05-27 16:08 ` [PATCH -stable,4.14 04/11] netfilter: nf_tables: validate registers coming from userspace Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 05/11] netfilter: nf_tables: add nft_setelem_parse_key() Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 06/11] netfilter: nf_tables: allow up to 64 bytes in the set element data area Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 07/11] netfilter: nf_tables: stricter validation of element data Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 08/11] netfilter: nft_dynset: do not reject set updates with NFT_SET_EVAL Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 09/11] netfilter: nf_tables: do not allow RULE_ID to refer to another chain Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 10/11] netfilter: nf_tables: do not allow SET_ID to refer to another table Pablo Neira Ayuso
2023-05-27 16:08 ` [PATCH -stable,4.14 11/11] netfilter: nf_tables: fix register ordering Pablo Neira Ayuso
2023-05-28 7:36 ` [PATCH -stable,4.14 00/11] more stable fixes for 4.14 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230527160811.67779-4-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=gregkh@linuxfoundation.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox