Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f2ede1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://1984.lsi.us.es/nf 



An interface name overflow fix in netfilter via Pablo Neira Ayuso.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd97120f 4a6dd664

net/netfilter/ipset/ip_set_hash_netiface.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ static struct ip_set_type hash_netiface_type __read_mostly = { 
		[IPSET_ATTR_IP]		= { .type = NLA_NESTED },

		[IPSET_ATTR_IP_TO]	= { .type = NLA_NESTED },

		[IPSET_ATTR_IFACE]	= { .type = NLA_NUL_STRING,

					    .len = IPSET_MAXNAMELEN - 1 },

					    .len  = IFNAMSIZ - 1 },

		[IPSET_ATTR_CADT_FLAGS]	= { .type = NLA_U32 },

		[IPSET_ATTR_CIDR]	= { .type = NLA_U8 },

		[IPSET_ATTR_TIMEOUT]	= { .type = NLA_U32 },