summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Hunter <donald.hunter@gmail.com>2024-08-06 17:43:24 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2024-08-14 23:27:38 +0200
commitd1a7b382a9d3f0f3e5a80e0be2991c075fa4f618 (patch)
tree6c2d832c8754fef1e59a9ff10a294a7b6a240279
parentnetfilter: allow ipv6 fragments to arrive on different devices (diff)
downloadlinux-d1a7b382a9d3f0f3e5a80e0be2991c075fa4f618.tar.xz
linux-d1a7b382a9d3f0f3e5a80e0be2991c075fa4f618.zip
netfilter: nfnetlink: Initialise extack before use in ACKs
Add missing extack initialisation when ACKing BATCH_BEGIN and BATCH_END. Fixes: bf2ac490d28c ("netfilter: nfnetlink: Handle ACK flags for batch messages") Signed-off-by: Donald Hunter <donald.hunter@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/netfilter/nfnetlink.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index 4abf660c7baf..932b3ddb34f1 100644
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -427,8 +427,10 @@ replay_abort:
nfnl_unlock(subsys_id);
- if (nlh->nlmsg_flags & NLM_F_ACK)
+ if (nlh->nlmsg_flags & NLM_F_ACK) {
+ memset(&extack, 0, sizeof(extack));
nfnl_err_add(&err_list, nlh, 0, &extack);
+ }
while (skb->len >= nlmsg_total_size(0)) {
int msglen, type;
@@ -577,6 +579,7 @@ done:
ss->abort(net, oskb, NFNL_ABORT_NONE);
netlink_ack(oskb, nlmsg_hdr(oskb), err, NULL);
} else if (nlh->nlmsg_flags & NLM_F_ACK) {
+ memset(&extack, 0, sizeof(extack));
nfnl_err_add(&err_list, nlh, 0, &extack);
}
} else {