]> www.infradead.org Git - users/dwmw2/linux.git/commit
netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info
authorJuliana Rodrigueiro <juliana.rodrigueiro@intra2net.com>
Fri, 16 Aug 2019 15:02:22 +0000 (17:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Sep 2019 05:15:32 +0000 (07:15 +0200)
commita46102f47dfe7da531facb9eacc5020e86ae7229
treecc6a9444d4a7f6187b8944708a2f4120d8e09d50
parent1399e6a5f1e7b543bfcc90b4e84197348df601b0
netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info

[ Upstream commit 89a26cd4b501e9511d3cd3d22327fc76a75a38b3 ]

When running a 64-bit kernel with a 32-bit iptables binary, the size of
the xt_nfacct_match_info struct diverges.

    kernel: sizeof(struct xt_nfacct_match_info) : 40
    iptables: sizeof(struct xt_nfacct_match_info)) : 36

Trying to append nfacct related rules results in an unhelpful message.
Although it is suggested to look for more information in dmesg, nothing
can be found there.

    # iptables -A <chain> -m nfacct --nfacct-name <acct-object>
    iptables: Invalid argument. Run `dmesg' for more information.

This patch fixes the memory misalignment by enforcing 8-byte alignment
within the struct's first revision. This solution is often used in many
other uapi netfilter headers.

Signed-off-by: Juliana Rodrigueiro <juliana.rodrigueiro@intra2net.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/uapi/linux/netfilter/xt_nfacct.h
net/netfilter/xt_nfacct.c