rtnetlink: add missing netlink_ns_capable() check for peer netns
Subsystems (2)
PATCH v3 1/1 rtnetlink: add missing netlink_ns_capable() check for peer netns
rtnl_newlink() lacks a CAP_NET_ADMIN capability check on the peer network namespace when creating paired devices (veth, vxcan, netkit). This allows an unprivileged user with a user namespace to create interfaces in arbitrary network namespaces, including init_net.
Add a netlink_ns_capable() check for CAP_NET_ADMIN in the peer namespace before allowing device creation to proceed.
---
v3:
- Move netlink_ns_capable() check from rtnl_newlink() into rtnl_get_peer_net(), after the last rtnl_link_get_net_ifla(tb) call. The tbp path is already covered by rtnl_link_get_net_capable() in the caller. (suggested by Kuniyuki)
- Pass skb to rtnl_get_peer_net() for the capability check.
- Add IS_ERR() check on rtnl_link_get_net_ifla(tb) return value.
v2:
- Removed "Reported-by" tag
- Fixed "Fixes" tag with the help of Kuniyuki Iwashima (thanks !)
net/core/rtnetlink.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
net/core/rtnetlink.c +17 -3
@@ -3894,12 +3894,14 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm, goto out; } -static struct net *rtnl_get_peer_net (const struct rtnl_link_ops *ops, +static struct net *rtnl_get_peer_net (struct sk_buff *skb, +const struct rtnl_link_ops *ops,struct nlattr *tbp[],struct nlattr *data[],struct netlink_ext_ack *extack) {struct nlattr *tb[IFLA_MAX +1 ]; +struct net *net;int err;if (!data || !data[ops->peer_type])
@@ -3915,7 +3917,19 @@ static struct net *rtnl_get_peer_net(const struct rtnl_link_ops *ops,return ERR_PTR (err); } -return rtnl_link_get_net_ifla (tb); + net =rtnl_link_get_net_ifla (tb); +if (IS_ERR (net)) +return net; + +if (!net) +return NULL ; + +if (!netlink_ns_capable (skb, net->user_ns,CAP_NET_ADMIN )) { +put_net (net); +return ERR_PTR (-EPERM ); + } + +return net; } static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -4054,7 +4068,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, }if (ops->peer_type) { - peer_net =rtnl_get_peer_net (ops, tb, data, extack); + peer_net =rtnl_get_peer_net (skb, ops, tb, data, extack);if (IS_ERR (peer_net)) { ret =PTR_ERR (peer_net); goto put_ops;
Signature · 1 line
2.34.1
Quoted 48 lines · Nikolaos Gkarlis
rtnl_newlink()lacks aCAP_NET_ADMINcapability check on the peer network namespace when creating paired devices (veth, vxcan, netkit). This allows an unprivileged user with a user namespace to create interfaces in arbitrary network namespaces, includinginit_net.Add a
netlink_ns_capable()check forCAP_NET_ADMINin the peer namespace before allowing device creation to proceed.Fixes 81adee47dfb6 ("net: Support specifying the network namespace upon device creation.")Signed-off-by Nikolaos Gkarlis <[email protected]>---
v3:
- Movenetlink_ns_capable()check fromrtnl_newlink()intortnl_get_peer_net(), after the lastrtnl_link_get_net_ifla(tb)call. The tbp path is already covered byrtnl_link_get_net_capable()in the caller. (suggested by Kuniyuki)
- Pass skb tortnl_get_peer_net()for the capability check.
- AddIS_ERR()check onrtnl_link_get_net_ifla(tb)return value.
v2:
- Removed "Reported-by" tag
- Fixed "Fixes" tag with the help of Kuniyuki Iwashima (thanks !)net/core/rtnetlink.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)net/core/rtnetlink.c +3
-1@@ -3894,12 +3894,14 @@ static int rtnl_newlink_create(struct sk_buff *skb, struct ifinfomsg *ifm, goto out; } -static struct net *rtnl_get_peer_net (const struct rtnl_link_ops *ops, +static struct net *rtnl_get_peer_net (struct sk_buff *skb, +const struct rtnl_link_ops *ops,struct nlattr *tbp[],struct nlattr *data[],struct netlink_ext_ack *extack) {struct nlattr *tb[IFLA_MAX +1 ]; +struct net *net;int err;if (!data || !data[ops->peer_type])
net/core/rtnetlink.c static struct net *rtnl_get_peer_net(const struct rtnl_link_ops *ops, · line 3921
Quoted 6 lines
net/core/rtnetlink.c +2
-1@@ -3915,7 +3917,19 @@ static struct net *rtnl_get_peer_net(const struct rtnl_link_ops *ops,return ERR_PTR (err); } -return rtnl_link_get_net_ifla (tb); + net =rtnl_link_get_net_ifla (tb); +if (IS_ERR (net))
nit: use IS_ERR_OR_NULL and remove "if (!net) below
Quoted 26 lines
net/core/rtnetlink.c +12
-2+return net; + +if (!net) +return NULL ; + +if (!netlink_ns_capable (skb, net->user_ns,CAP_NET_ADMIN )) { +put_net (net); +return ERR_PTR (-EPERM ); + } + +return net; } static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,@@ -4054,7 +4068,7 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, }if (ops->peer_type) { - peer_net =rtnl_get_peer_net (ops, tb, data, extack); + peer_net =rtnl_get_peer_net (skb, ops, tb, data, extack);if (IS_ERR (peer_net)) { ret =PTR_ERR (peer_net); goto put_ops; --2.34.1