net: netlink: filter particular protocols from analyzers

Fix finer-grained control and let only a whitelist of allowed netlink
protocols pass, in our case related to networking. If later on, other
subsystems decide they want to add their protocol as well to the list
of allowed protocols they shall simply add it. While at it, we also
need to tell what protocol is in use otherwise BPF_S_ANC_PROTOCOL can
not pick it up (as it's not filled out).

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index a17dda1bbee0704935c92c7d265268fb73c724a1..8df7f64c6db35a0f538bef1fa0206f7826fd1a14 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -168,16 +168,43 @@ int netlink_remove_tap(struct netlink_tap *nt)
 }
 EXPORT_SYMBOL_GPL(netlink_remove_tap);
 
+static bool netlink_filter_tap(const struct sk_buff *skb)
+{
+       struct sock *sk = skb->sk;
+       bool pass = false;
+
+       /* We take the more conservative approach and
+        * whitelist socket protocols that may pass.
+        */
+       switch (sk->sk_protocol) {
+       case NETLINK_ROUTE:
+       case NETLINK_USERSOCK:
+       case NETLINK_SOCK_DIAG:
+       case NETLINK_NFLOG:
+       case NETLINK_XFRM:
+       case NETLINK_FIB_LOOKUP:
+       case NETLINK_NETFILTER:
+       case NETLINK_GENERIC:
+               pass = true;
+               break;
+       }
+
+       return pass;
+}
+
 static int __netlink_deliver_tap_skb(struct sk_buff *skb,
                                     struct net_device *dev)
 {
        struct sk_buff *nskb;
+       struct sock *sk = skb->sk;
        int ret = -ENOMEM;
 
        dev_hold(dev);
        nskb = skb_clone(skb, GFP_ATOMIC);
        if (nskb) {
                nskb->dev = dev;
+               nskb->protocol = htons((u16) sk->sk_protocol);
+
                ret = dev_queue_xmit(nskb);
                if (unlikely(ret > 0))
                        ret = net_xmit_errno(ret);
@@ -192,6 +219,9 @@ static void __netlink_deliver_tap(struct sk_buff *skb)
        int ret;
        struct netlink_tap *tmp;
 
+       if (!netlink_filter_tap(skb))
+               return;
+
        list_for_each_entry_rcu(tmp, &netlink_tap_all, list) {
                ret = __netlink_deliver_tap_skb(skb, tmp->dev);
                if (unlikely(ret))