diff options
author | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
commit | 4c80e9323967125ab8aa7c271ccc7624abc08832 (patch) | |
tree | c9881b5814c184aa0c1cb58c6383beab9173e388 /include/net/netfilter/nf_tables.h | |
parent | ef759e4a28c88965972c815af6023f41bd733316 (diff) | |
parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
download | linux-4c80e9323967125ab8aa7c271ccc7624abc08832.tar.xz |
Merge tag 'v5.9-rc4' into next
Linux 5.9-rc4
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); } |