netfilter: nf_tables: Modify nla_memdup's flag to GFP_KERNEL_ACCOUNT

Chen Aotian · ummakynes · commit af0acf22aea3 · 2023-04-06T11:33:52.000+02:00
For memory alloc that store user data from nla[NFTA_OBJ_USERDATA], use GFP_KERNEL_ACCOUNT is more suitable. Fixes: 33758c8 ("memcg: enable accounting for nft objects") Signed-off-by: Chen Aotian <chenaotian2@163.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
@@ -7052,7 +7052,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;
 

Original file line number	Diff line number	Diff line change
`@@ -7052,7 +7052,7 @@ static int nf_tables_newobj(struct sk_buff skb, const struct nfnl_info info,`
`7052`	`7052`	`}`
`7053`	`7053`
`7054`	`7054`	`if (nla[NFTA_OBJ_USERDATA]) {`
`7055`		`- obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL);`
	`7055`	`+ obj->udata = nla_memdup(nla[NFTA_OBJ_USERDATA], GFP_KERNEL_ACCOUNT);`
`7056`	`7056`	`if (obj->udata == NULL)`
`7057`	`7057`	`goto err_userdata;`
`7058`	`7058`