Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a3d4c36 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: fail batch if fatal signal is pending 



abort batch processing and return so task can exit faster.
Otherwise even SIGKILL has no immediate effect.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent d6501de8

net/netfilter/nfnetlink.c

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/uaccess.h>

#include <net/sock.h>

#include <linux/init.h>

#include <linux/sched/signal.h>



#include <net/netlink.h>

#include <linux/netfilter/nfnetlink.h>
@@ -330,6 +331,13 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, 
	while (skb->len >= nlmsg_total_size(0)) {

		int msglen, type;



		if (fatal_signal_pending(current)) {

			nfnl_err_reset(&err_list);

			err = -EINTR;

			status = NFNL_BATCH_FAILURE;

			goto done;

		}



		memset(&extack, 0, sizeof(extack));

		nlh = nlmsg_hdr(skb);

		err = 0;