diff options
| author | David S. Miller | 2012-11-28 17:29:43 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-11-28 17:29:43 +0100 |
| commit | 52f2ede1ced85040f00d0dc70dad2d4ae7c46aa6 (patch) | |
| tree | 78ea559eb497667a9f676657403f18df2535c917 /net | |
| parent | vhost: fix length for cross region descriptor (diff) | |
| parent | netfilter: ipset: fix netiface set name overflow (diff) | |
| download | kernel-qcow2-linux-52f2ede1ced85040f00d0dc70dad2d4ae7c46aa6.tar.gz kernel-qcow2-linux-52f2ede1ced85040f00d0dc70dad2d4ae7c46aa6.tar.xz kernel-qcow2-linux-52f2ede1ced85040f00d0dc70dad2d4ae7c46aa6.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf
An interface name overflow fix in netfilter via Pablo Neira Ayuso.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipset/ip_set_hash_netiface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c index b9a63381e349..45a101439bc5 100644 --- a/net/netfilter/ipset/ip_set_hash_netiface.c +++ b/net/netfilter/ipset/ip_set_hash_netiface.c @@ -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 }, |