bonding: Display LACP info only to CAP_NET_ADMIN capable user

Actor and Partner details can be accessed via proc-fs, sys-fs
entries or netlink interface. These interfaces are world readable
at this moment. The earlier patch-series made the LACP communication
secure to avoid nuisance attack from within the same L2 domain but
it did not prevent "someone unprivileged" looking at that information
on host and perform the same act.

This patch essentially avoids spitting those entries if the user
in question does not have enough privileges.

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index 5580fcde738f9ae05e72541ec94686cd431b48b8..1bda29249d12254ddbdd2e35572597464a9380c2 100644 (file)
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -601,19 +601,20 @@ static int bond_fill_info(struct sk_buff *skb,
        if (BOND_MODE(bond) == BOND_MODE_8023AD) {
                struct ad_info info;
 
-               if (nla_put_u16(skb, IFLA_BOND_AD_ACTOR_SYS_PRIO,
-                               bond->params.ad_actor_sys_prio))
-                       goto nla_put_failure;
-
-               if (nla_put_u16(skb, IFLA_BOND_AD_USER_PORT_KEY,
-                               bond->params.ad_user_port_key))
-                       goto nla_put_failure;
+               if (capable(CAP_NET_ADMIN)) {
+                       if (nla_put_u16(skb, IFLA_BOND_AD_ACTOR_SYS_PRIO,
+                                       bond->params.ad_actor_sys_prio))
+                               goto nla_put_failure;
 
-               if (nla_put(skb, IFLA_BOND_AD_ACTOR_SYSTEM,
-                           sizeof(bond->params.ad_actor_system),
-                           &bond->params.ad_actor_system))
-                       goto nla_put_failure;
+                       if (nla_put_u16(skb, IFLA_BOND_AD_USER_PORT_KEY,
+                                       bond->params.ad_user_port_key))
+                               goto nla_put_failure;
 
+                       if (nla_put(skb, IFLA_BOND_AD_ACTOR_SYSTEM,
+                                   sizeof(bond->params.ad_actor_system),
+                                   &bond->params.ad_actor_system))
+                               goto nla_put_failure;
+               }
                if (!bond_3ad_get_active_agg_info(bond, &info)) {
                        struct nlattr *nest;
 

diff --cc drivers/net/bonding/bond_procfs.c
Simple merge

diff --cc drivers/net/bonding/bond_sysfs.c
Simple merge