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

netfilter: nf_tables: nft_obj_filter fits into cb->ctx

Browse Source 
[ Upstream commit 5a893b9cdf6fa5758f43d323a1d7fa6d1bf489ff ]

No need to allocate it if one may just use struct netlink_callback's
scratch area for it.

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:32 +02:00
committed by Greg Kroah-Hartman
parent 7ee3484ad1
commit 71b6d8d3a8
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/netfilter/nf_tables_api.c
View File

@@ -7425,7 +7425,7 @@ struct nft_obj_dump_ctx {
static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb) static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)
{ {
const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh); const struct nfgenmsg *nfmsg = nlmsg_data(cb->nlh);
struct nft_obj_dump_ctx *ctx = cb->data; struct nft_obj_dump_ctx *ctx = (void *)cb->ctx;
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
int family = nfmsg->nfgen_family; int family = nfmsg->nfgen_family;
struct nftables_pernet *nft_net; struct nftables_pernet *nft_net;
@@ -7487,34 +7487,28 @@ cont:
static int nf_tables_dump_obj_start(struct netlink_callback *cb) static int nf_tables_dump_obj_start(struct netlink_callback *cb)
{ {
struct nft_obj_dump_ctx *ctx = (void *)cb->ctx;
const struct nlattr * const *nla = cb->data; const struct nlattr * const *nla = cb->data;
struct nft_obj_dump_ctx *ctx = NULL;
ctx = kzalloc(sizeof(*ctx), GFP_ATOMIC); BUILD_BUG_ON(sizeof(*ctx) > sizeof(cb->ctx));
if (!ctx)
return -ENOMEM;
if (nla[NFTA_OBJ_TABLE]) { if (nla[NFTA_OBJ_TABLE]) {
ctx->table = nla_strdup(nla[NFTA_OBJ_TABLE], GFP_ATOMIC); ctx->table = nla_strdup(nla[NFTA_OBJ_TABLE], GFP_ATOMIC);
if (!ctx->table) { if (!ctx->table)
kfree(ctx);
return -ENOMEM; return -ENOMEM;
}
} }
if (nla[NFTA_OBJ_TYPE]) if (nla[NFTA_OBJ_TYPE])
ctx->type = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE])); ctx->type = ntohl(nla_get_be32(nla[NFTA_OBJ_TYPE]));
cb->data = ctx;
return 0; return 0;
} }
static int nf_tables_dump_obj_done(struct netlink_callback *cb) static int nf_tables_dump_obj_done(struct netlink_callback *cb)
{ {
struct nft_obj_dump_ctx *ctx = cb->data; struct nft_obj_dump_ctx *ctx = (void *)cb->ctx;
kfree(ctx->table); kfree(ctx->table);
kfree(ctx);
return 0; return 0;
} }