Commit 00308791 authored May 25, 2018 by Florian Westphal Committed by Pablo Neira Ayuso May 29, 2018

netfilter: nfnetlink: allow commit to fail



->commit() cannot fail at the moment.

Followup-patch adds kmalloc calls in the commit phase, so we'll need
to be able to handle errors.

Make it so that -EGAIN causes a full replay, and make other errors
cause the transaction to fail.

Failing is ok from a consistency point of view as long as we
perform all actions that could return an error before
we increment the generation counter and the base seq.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 1ac89d20

net/netfilter/nfnetlink.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -441,7 +441,14 @@ static void nfnetlink_rcv_batch(struct sk_buff skb, struct nlmsghdr nlh,
		kfree_skb(skb);
		goto replay;
		} else if (status == NFNL_BATCH_DONE) {
		ss->commit(net, oskb);
		err = ss->commit(net, oskb);
		if (err == -EAGAIN) {
		status \|= NFNL_BATCH_REPLAY;
		goto done;
		} else if (err) {
		ss->abort(net, oskb);
		netlink_ack(oskb, nlmsg_hdr(oskb), err, NULL);
		}
		} else {
		ss->abort(net, oskb);
		}