From: Parav Pandit parav@nvidia.com
[ Upstream commit a7b43649507dae4e55ff0087cad4e4dd1c6d5b99 ]
When devlink reload operation is not used, netdev of an Ethernet port may be present in different net namespace than the net namespace of the devlink instance.
Ensure that both the devlink instance and devlink port netdev are located in same net namespace.
Fixes: 070c63f20f6c ("net: devlink: allow to change namespaces during reload") Signed-off-by: Parav Pandit parav@nvidia.com Signed-off-by: Jakub Kicinski kuba@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- net/core/devlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
--- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -626,9 +626,10 @@ static int devlink_nl_port_fill(struct s devlink_port->desired_type)) goto nla_put_failure_type_locked; if (devlink_port->type == DEVLINK_PORT_TYPE_ETH) { + struct net *net = devlink_net(devlink_port->devlink); struct net_device *netdev = devlink_port->type_dev;
- if (netdev && + if (netdev && net_eq(net, dev_net(netdev)) && (nla_put_u32(msg, DEVLINK_ATTR_PORT_NETDEV_IFINDEX, netdev->ifindex) || nla_put_string(msg, DEVLINK_ATTR_PORT_NETDEV_NAME,