Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752473AbdLFUMu (ORCPT ); Wed, 6 Dec 2017 15:12:50 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34130 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbdLFUMr (ORCPT ); Wed, 6 Dec 2017 15:12:47 -0500 X-Google-Smtp-Source: AGs4zMbHkxuopYisMCfsYF1QNogeAnRhnV7dJa5ksy7LXkNCqo8TBCaBsIlkWhJNm6fG2CjxYfQdwg== From: Kevin Cernekee To: davem@davemloft.net Cc: johannes.berg@intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, daniel@iogearbox.net, dsahern@gmail.com Subject: [PATCH V2] netlink: Add netns check on taps Date: Wed, 6 Dec 2017 12:12:27 -0800 Message-Id: <1512591147-29618-1-git-send-email-cernekee@chromium.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1245 Lines: 41 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 --- net/netlink/af_netlink.c | 3 +++ 1 file changed, 3 insertions(+) V1->V2: Drop the special exception for init_net. Compile-tested only, will retest later today. diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index b9e0ee4..79cc1bf 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -253,6 +253,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 (is_vmalloc_addr(skb->head)) -- 2.7.4