Commit 0de53b0f authored by Stefano Brivio's avatar Stefano Brivio Committed by Pablo Neira Ayuso
Browse files

selftests: netfilter: Add correctness test for mac,net set type 



The existing net,mac test didn't cover the issue recently reported
by Nikita Yushchenko, where MAC addresses wouldn't match if given
as first field of a concatenated set with AVX2 and 8-bit groups,
because there's a different code path covering the lookup of six
8-bit groups (MAC addresses) if that's the first field.

Add a similar mac,net test, with MAC address and IPv4 address
swapped in the set specification.

Signed-off-by: default avatarStefano Brivio <sbrivio@redhat.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent b7e945e2

tools/testing/selftests/netfilter/nft_concat_range.sh

+21 −3
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ TESTS="reported_issues correctness concurrency timeout" 


# Set types, defined by TYPE_ variables below

TYPES="net_port port_net net6_port port_proto net6_port_mac net6_port_mac_proto

       net_port_net net_mac net_mac_icmp net6_mac_icmp net6_port_net6_port

       net_port_mac_proto_net"

       net_port_net net_mac mac_net net_mac_icmp net6_mac_icmp

       net6_port_net6_port net_port_mac_proto_net"



# Reported bugs, also described by TYPE_ variables below

BUGS="flush_remove_add"
@@ -277,6 +277,23 @@ perf_entries 1000 
perf_proto	ipv4

"



TYPE_mac_net="

display		mac,net

type_spec	ether_addr . ipv4_addr

chain_spec	ether saddr . ip saddr

dst		 

src		mac addr4

start		1

count		5

src_delta	2000

tools		sendip nc bash

proto		udp



race_repeat	0



perf_duration	0

"



TYPE_net_mac_icmp="

display		net,mac - ICMP

type_spec	ipv4_addr . ether_addr
@@ -984,7 +1001,8 @@ format() { 
		fi

	done

	for f in ${src}; do

		__expr="${__expr} . "

		[ "${__expr}" != "{ " ] && __expr="${__expr} . "



		__start="$(eval format_"${f}" "${srcstart}")"

		__end="$(eval format_"${f}" "${srcend}")"