netfilter: nfnetlink_log: account for netlink header size

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This is a followup to an old bug fix: NLMSG_DONE needs to account
for the netlink header size, not just the attribute size.

This can result in a WARN splat + drop of the netlink message,
but other than this there are no ill effects.

Fixes: 9dfa1dfe4d5e ("netfilter: nf_log: account for size of NLMSG_DONE attribute")
Reported-by: Yiming Qian <yimingqian591@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Florian Westphal and committed by

Pablo Neira Ayuso 2 months ago 6d52a4a0 76522fcd

+1 -1

1 changed file

expand all

net

netfilter

nfnetlink_log.c

+1 -1

net/netfilter/nfnetlink_log.c

··· 726 726 + nla_total_size(plen) /* prefix */ 727 727 + nla_total_size(sizeof(struct nfulnl_msg_packet_hw)) 728 728 + nla_total_size(sizeof(struct nfulnl_msg_packet_timestamp)) 729 - + nla_total_size(sizeof(struct nfgenmsg)); /* NLMSG_DONE */ 729 + + nlmsg_total_size(sizeof(struct nfgenmsg)); /* NLMSG_DONE */ 730 730 731 731 if (in && skb_mac_header_was_set(skb)) { 732 732 size += nla_total_size(skb->dev->hard_header_len)

Configure Feed

Configure Feed