shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: A better name for nft_obj_filter

Browse Source 
[ Upstream commit ecf49cad807061d880bea27a5da8e0114ddc7690 ]

Name it for what it is supposed to become, a real nft_obj_dump_ctx. No
functional change intended.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Stable-dep-of: bd662c4218f9 ("netfilter: nf_tables: Add locking for NFT_MSG_GETOBJ_RESET requests")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Phil Sutter
2023-10-20 19:34:30 +02:00
committed by Greg Kroah-Hartman
parent 6ac72b0f8e
commit f71f265273
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
net/netfilter/nf_tables_api.c
View File

@@ -7416,7 +7416,7 @@ static void audit_log_obj_reset(const struct nft_table *table,
kfree(buf);
}
struct nft_obj_filter {
struct nft_obj_dump_ctx {
char *table;
u32 type;
};
@@ -7426,7 +7426,7 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
const struct nft_table *table;
unsigned int idx = 0, s_idx = cb->args[0];
struct nft_obj_filter *filter = cb->data;
struct nft_obj_dump_ctx *ctx = cb->data;
struct net *net = sock_net(skb->sk);
int family = nfmsg->nfgen_family;
struct nftables_pernet *nft_net;
@@ -7452,10 +7452,10 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)
goto cont;
if (idx < s_idx)
goto cont;
if (filter->table && strcmp(filter->table, table->name))
if (ctx->table && strcmp(ctx->table, table->name))
goto cont;
if (filter->type != NFT_OBJECT_UNSPEC &&
obj->ops->type->type != filter->type)
if (ctx->type != NFT_OBJECT_UNSPEC &&
obj->ops->type->type != ctx->type)
goto cont;
rc = nf_tables_fill_obj_info(skb, net,
@@ -7487,33 +7487,33 @@ cont:
static int nf_tables_dump_obj_start(struct netlink_callback *cb)
{
const struct nlattr * const *nla = cb->data;
struct nft_obj_filter *filter = NULL;
struct nft_obj_dump_ctx *ctx = NULL;
filter = kzalloc(sizeof(*filter), GFP_ATOMIC);
if (!filter)
ctx = kzalloc(sizeof(*ctx), GFP_ATOMIC);
if (!ctx)
return -ENOMEM;
if (nla[NFTA_OBJ_TABLE]) {
filter->table = nla_strdup(nla[NFTA_OBJ_TABLE], GFP_ATOMIC);
if (!filter->table) {
kfree(filter);
ctx->table = nla_strdup(nla[NFTA_OBJ_TABLE], GFP_ATOMIC);
if (!ctx->table) {
kfree(ctx);
return -ENOMEM;
}
}
if (nla[NFTA_OBJ_TYPE])
filter->type = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE]));
ctx->type = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE]));
cb->data = filter;
cb->data = ctx;
return 0;
}
static int nf_tables_dump_obj_done(struct netlink_callback *cb)
{
struct nft_obj_filter *filter = cb->data;
struct nft_obj_dump_ctx *ctx = cb->data;
kfree(filter->table);
kfree(filter);
kfree(ctx->table);
kfree(ctx);
return 0;
}