diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-08-24 06:37:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-24 06:37:05 -0700 |
| commit | a26aea2010601920ad3e61abdc22ad38a805be94 (patch) | |
| tree | a991be9108835cddadab46c509aecf234e644003 /include/net/netfilter/nf_tables.h | |
| parent | net: systemport: Fix memleak in bcm_sysport_probe (diff) | |
| parent | netfilter: nf_tables: fix destination register zeroing (diff) | |
| download | wireguard-linux-a26aea2010601920ad3e61abdc22ad38a805be94.tar.xz wireguard-linux-a26aea2010601920ad3e61abdc22ad38a805be94.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter fixes for net:
1) Don't flag SCTP heartbeat as invalid for re-used connections,
from Florian Westphal.
2) Bogus overlap report due to rbtree tree rotations, from Stefano Brivio.
3) Detect partial overlap with start end point match, also from Stefano.
4) Skip netlink dump of NFTA_SET_USERDATA is unset.
5) Incorrect nft_list_attributes enumeration definition.
6) Missing zeroing before memcpy to destination register, also
from Florian.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/netfilter/nf_tables.h')
| -rw-r--r-- | include/net/netfilter/nf_tables.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index bf9491b77d16..224d194ad29d 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -143,6 +143,8 @@ static inline u64 nft_reg_load64(const u32 *sreg) static inline void nft_data_copy(u32 *dst, const struct nft_data *src, unsigned int len) { + if (len % NFT_REG32_SIZE) + dst[len / NFT_REG32_SIZE] = 0; memcpy(dst, src, len); } |