Skip to content

Commit d1a7b38

Browse files
donaldhummakynes
authored andcommitted
netfilter: nfnetlink: Initialise extack before use in ACKs
Add missing extack initialisation when ACKing BATCH_BEGIN and BATCH_END. Fixes: bf2ac49 ("netfilter: nfnetlink: Handle ACK flags for batch messages") Signed-off-by: Donald Hunter <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent 3cd740b commit d1a7b38

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/netfilter/nfnetlink.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,10 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,
427427

428428
nfnl_unlock(subsys_id);
429429

430-
if (nlh->nlmsg_flags & NLM_F_ACK)
430+
if (nlh->nlmsg_flags & NLM_F_ACK) {
431+
memset(&extack, 0, sizeof(extack));
431432
nfnl_err_add(&err_list, nlh, 0, &extack);
433+
}
432434

433435
while (skb->len >= nlmsg_total_size(0)) {
434436
int msglen, type;
@@ -577,6 +579,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,
577579
ss->abort(net, oskb, NFNL_ABORT_NONE);
578580
netlink_ack(oskb, nlmsg_hdr(oskb), err, NULL);
579581
} else if (nlh->nlmsg_flags & NLM_F_ACK) {
582+
memset(&extack, 0, sizeof(extack));
580583
nfnl_err_add(&err_list, nlh, 0, &extack);
581584
}
582585
} else {

0 commit comments

Comments
 (0)