From: Chen Aotian Date: Thu, 6 Apr 2023 04:01:51 +0000 (+0800) Subject: netfilter: nf_tables: Modify nla_memdup's flag to GFP_KERNEL_ACCOUNT X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1c4dbb001fd38828f564584f0c0eca5b39b0ee3c;p=users%2Fjedix%2Flinux-maple.git netfilter: nf_tables: Modify nla_memdup's flag to GFP_KERNEL_ACCOUNT [ Upstream commit af0acf22aea359e04412237d68787401f96bb583 ] For memory alloc that store user data from nla[NFTA_OBJ_USERDATA], use GFP_KERNEL_ACCOUNT is more suitable. Fixes: 33758c891479 ("memcg: enable accounting for nft objects") Signed-off-by: Chen Aotian Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 1a9d759d0a02..ee052a5874fc 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -6980,7 +6980,7 @@ static int nf_tables_newobj(struct sk_buff *skb, const struct nfnl_info *info, } if (nla[NFTA_OBJ_USERDATA]) { - obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL); + obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL_ACCOUNT); if (obj->udata == NULL) goto err_userdata;