android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nfnetlink: skip error delivery on batch in case of ENOMEM

Browse Source 
[ Upstream commit a1a64a151dae8ac3581c1cbde44b672045cb658b ]

If caller reports ENOMEM, then stop iterating over the batch and send a
single netlink message to userspace to report OOM.

Fixes: cbb8125eb4 ("netfilter: nfnetlink: deliver netlink errors on batch completion")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pablo Neira Ayuso 2023-06-08 00:19:12 +02:00 committed by Greg Kroah-Hartman
parent 55b7a00f34
commit 8fddf3f051
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/netfilter/nfnetlink.c
View File

@ -533,7 +533,8 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,
* processed, this avoids that the same error is * processed, this avoids that the same error is
* reported several times when replaying the batch. * reported several times when replaying the batch.
*/ */
if (nfnl_err_add(&err_list, nlh, err, &extack) < 0) { if (err == -ENOMEM ||
nfnl_err_add(&err_list, nlh, err, &extack) < 0) {
/* We failed to enqueue an error, reset the /* We failed to enqueue an error, reset the
* list of errors and send OOM to userspace * list of errors and send OOM to userspace
* pointing to the batch header. * pointing to the batch header.