Florian Westphal 86c4599155 netfilter: nf_tables: fix destination register zeroing
[ Upstream commit 1e105e6afa6c3d32bfb52c00ffa393894a525c27 ]

Following bug was reported via irc:
nft list ruleset
   set knock_candidates_ipv4 {
      type ipv4_addr . inet_service
      size 65535
      elements = { 127.0.0.1 . 123,
                   127.0.0.1 . 123 }
      }
 ..
   udp dport 123 add @knock_candidates_ipv4 { ip saddr . 123 }
   udp dport 123 add @knock_candidates_ipv4 { ip saddr . udp dport }

It should not have been possible to add a duplicate set entry.

After some debugging it turned out that the problem is the immediate
value (123) in the second-to-last rule.

Concatenations use 32bit registers, i.e. the elements are 8 bytes each,
not 6 and it turns out the kernel inserted

inet firewall @knock_candidates_ipv4
        element 0100007f ffff7b00  : 0 [end]
        element 0100007f 00007b00  : 0 [end]

Note the non-zero upper bits of the first element.  It turns out that
nft_immediate doesn't zero the destination register, but this is needed
when the length isn't a multiple of 4.

Furthermore, the zeroing in nft_payload is broken.  We can't use
[len / 4] = 0 -- if len is a multiple of 4, index is off by one.

Skip zeroing in this case and use a conditional instead of (len -1) / 4.

Fixes: 49499c3e6e18 ("netfilter: nf_tables: switch registers to 32 bit addressing")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-09-09 19:04:25 +02:00
..
2019-07-03 13:14:42 +02:00
2018-01-19 14:02:12 -05:00
2019-06-17 19:51:56 +02:00
2019-03-23 20:09:51 +01:00
2019-02-23 09:07:27 +01:00
2018-07-18 15:08:31 -07:00
2018-02-28 11:43:28 -05:00
2019-11-10 11:27:54 +01:00
2020-07-22 09:31:58 +02:00
2017-12-11 14:10:06 -05:00
2019-03-10 07:17:19 +01:00
2019-11-20 18:46:35 +01:00
2018-06-18 22:40:32 +02:00
2018-04-07 22:32:31 -04:00
2017-11-08 16:12:33 +09:00
2018-05-16 07:23:35 +02:00
2017-12-05 14:37:13 -05:00
2018-05-16 07:23:35 +02:00
2018-05-31 22:48:46 -04:00
2018-06-22 13:43:27 +09:00
2018-06-22 13:43:27 +09:00
2020-05-20 08:18:38 +02:00
2018-04-17 13:53:13 -04:00