]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
netlink: Add netns check on taps
authorKevin Cernekee <cernekee@chromium.org>
Wed, 6 Dec 2017 20:12:27 +0000 (12:12 -0800)
committerBrian Maly <brian.maly@oracle.com>
Tue, 8 May 2018 20:45:04 +0000 (16:45 -0400)
Currently, a nlmon link inside a child namespace can observe systemwide
netlink activity.  Filter the traffic so that nlmon can only sniff
netlink messages from its own netns.

Test case:

    vpnns -- bash -c "ip link add nlmon0 type nlmon; \
                      ip link set nlmon0 up; \
                      tcpdump -i nlmon0 -q -w /tmp/nlmon.pcap -U" &
    sudo ip xfrm state add src 10.1.1.1 dst 10.1.1.2 proto esp \
        spi 0x1 mode transport \
        auth sha1 0x6162633132330000000000000000000000000000 \
        enc aes 0x00000000000000000000000000000000
    grep --binary abc123 /tmp/nlmon.pcap

Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 93c647643b48f0131f02e45da3bd367d80443291)

Orabug: 27260799
CVE: CVE-2017-17449

Signed-off-by: Shan Hai <shan.hai@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
net/netlink/af_netlink.c

index 0ab59d45f275d547502d3d5824127e727ce0a711..a730d125b0c7590453845c41956a32307c605dba 100644 (file)
@@ -222,6 +222,9 @@ static int __netlink_deliver_tap_skb(struct sk_buff *skb,
        struct sock *sk = skb->sk;
        int ret = -ENOMEM;
 
+       if (!net_eq(dev_net(dev), sock_net(sk)))
+               return 0;
+
        dev_hold(dev);
 
        if (netlink_skb_is_mmaped(skb) || is_vmalloc_addr(skb->head))