diff options
| author | Pablo Neira Ayuso | 2015-08-12 17:41:00 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2015-08-19 21:21:41 +0200 |
| commit | bf798657eb5ba57552096843c315f096fdf9b715 (patch) | |
| tree | 61238c85e128ab3d010113f01182d7fbcbf01b86 /include/net/netfilter/nf_tables.h | |
| parent | batman-adv: Fix memory leak on tt add with invalid vlan (diff) | |
| download | kernel-qcow2-linux-bf798657eb5ba57552096843c315f096fdf9b715.tar.gz kernel-qcow2-linux-bf798657eb5ba57552096843c315f096fdf9b715.tar.xz kernel-qcow2-linux-bf798657eb5ba57552096843c315f096fdf9b715.zip | |
netfilter: nf_tables: Use 32 bit addressing register from nft_type_to_reg()
nft_type_to_reg() needs to return the register in the new 32 bit addressing,
otherwise we hit EINVAL when using mappings.
Fixes: 49499c3 ("netfilter: nf_tables: switch registers to 32 bit addressing")
Reported-by: Andreas Schultz <aschultz@tpip.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/net/netfilter/nf_tables.h')
| -rw-r--r-- | include/net/netfilter/nf_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index 2a246680a6c3..aa8bee72c9d3 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -125,7 +125,7 @@ static inline enum nft_data_types nft_dreg_to_type(enum nft_registers reg) static inline enum nft_registers nft_type_to_reg(enum nft_data_types type) { - return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1; + return type == NFT_DATA_VERDICT ? NFT_REG_VERDICT : NFT_REG_1 * NFT_REG_SIZE / NFT_REG32_SIZE; } unsigned int nft_parse_register(const struct nlattr *attr); |