Commit 474e0adf authored Jun 08, 2023 by Pablo Neira Ayuso Committed by Greg Kroah-Hartman Jun 21, 2023

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



[ 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: cbb8125e ("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>

parent 67cafcd3

net/netfilter/nfnetlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -455,7 +455,8 @@ static void nfnetlink_rcv_batch(struct sk_buff skb, struct nlmsghdr nlh,
		* processed, this avoids that the same error is
		* 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
		* list of errors and send OOM to userspace
		* pointing to the batch header.