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>

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 03ead8a9e90ccfcc1936ee66064269dec4719fbd..88c9e222b67094fb641318e2bfa99a459fb2cf63 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -441,7 +441,14 @@ done:
                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);
        }