This is rather straightforward.
Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxx>
---
include/linux/netfilter/nfnetlink_xtables.h | 1 +
net/netfilter/xt2_nfnetlink.c | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/include/linux/netfilter/nfnetlink_xtables.h b/include/linux/netfilter/nfnetlink_xtables.h
index 2399678..497200b 100644
--- a/include/linux/netfilter/nfnetlink_xtables.h
+++ b/include/linux/netfilter/nfnetlink_xtables.h
@@ -8,6 +8,7 @@ enum nfxt_msg_type {
NFXTM_CHAIN_MOVE,
NFXTM_TABLE_REPLACE,
NFXTM_COMMIT,
+ NFXTM_ABORT,
};
/**
diff --git a/net/netfilter/xt2_nfnetlink.c b/net/netfilter/xt2_nfnetlink.c
index 0ef6442..08bcc5e 100644
--- a/net/netfilter/xt2_nfnetlink.c
+++ b/net/netfilter/xt2_nfnetlink.c
@@ -438,6 +438,32 @@ xtnetlink_commit(struct sock *xtnl, struct sk_buff *iskb,
return xtnetlink_error(xtnl, &ref, NFXTE_SUCCESS);
}
+/**
+ * NFXTM_ABORT: The client wants to explicitly abandon a transaction it itself
+ * had started earlier. Usually issued by the client when part of a
+ * transaction, for example a NFXTM_CHAIN_SPLICE within a
+ * NFXTM_TABLE_REPLACE..NFXTM_COMMIT window yielded ENOMEM.
+ */
+static int
+xtnetlink_abort(struct sock *xtnl, struct sk_buff *iskb,
+ const struct nlmsghdr *imsg, const struct nlattr *const *ad)
+{
+ struct xtnetlink_pktref ref = {.c_skb = iskb, .c_msg = imsg};
+ struct xtnetlink_transact *xa;
+ int ret;
+
+ mutex_lock(&xtnetlink_transact_lock);
+ xa = xtnetlink_transact_lookup(sock_net(xtnl), NETLINK_CB(iskb).pid);
+ if (xa == NULL) {
+ ret = NFXTE_TRANSACT_INACTIVE;
+ } else {
+ xtnetlink_transact_free(xa);
+ ret = NFXTE_SUCCESS;
+ }
+ mutex_unlock(&xtnetlink_transact_lock);
+ return xtnetlink_error(xtnl, &ref, ret);
+}
+
static const struct nla_policy xtnetlink_policy[] = {
[NFXTA_NAME] = {.type = NLA_NUL_STRING},
[NFXTA_ERRNO] = {.type = NLA_U32},
@@ -461,6 +487,7 @@ static const struct nfnl_callback xtnetlink_callback[] = {
[NFXTM_CHAIN_MOVE] = {.call = xtnetlink_chain_move, pol},
[NFXTM_TABLE_REPLACE] = {.call = xtnetlink_table_replace, pol},
[NFXTM_COMMIT] = {.call = xtnetlink_commit, pol},
+ [NFXTM_ABORT] = {.call = xtnetlink_abort, pol},
};
#undef pol
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
