From: Parav Pandit <parav@nvidia.com>
To: <kuba@kernel.org>, <davem@davemloft.net>,
<netdev@vger.kernel.org>, <jiri@nvidia.com>
Cc: Parav Pandit <parav@nvidia.com>
Subject: [PATCH net v2 2/2] devlink: Make sure devlink instance and port are in same net namespace
Date: Wed, 25 Nov 2020 11:16:20 +0200 [thread overview]
Message-ID: <20201125091620.6781-3-parav@nvidia.com> (raw)
In-Reply-To: <20201125091620.6781-1-parav@nvidia.com>
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>
---
Changelog:
v1->v2:
- avoided refactor code from previous patch
---
net/core/devlink.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 04ae67bbe19c..28c45be7f1bf 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -802,9 +802,10 @@ static int devlink_nl_port_fill(struct sk_buff *msg, struct devlink *devlink,
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,
--
2.26.2
next prev parent reply other threads:[~2020-11-25 9:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-22 6:12 [PATCH net 0/2] devlink port attribute fixes Parav Pandit
2020-11-22 6:12 ` [PATCH net 1/2] devlink: Hold rtnl lock while reading netdev attributes Parav Pandit
2020-11-24 22:29 ` Jakub Kicinski
2020-11-25 7:13 ` Parav Pandit
2020-11-25 16:30 ` Jakub Kicinski
2020-11-25 17:21 ` Parav Pandit
2020-11-25 17:41 ` Jakub Kicinski
2020-11-25 18:17 ` Parav Pandit
2020-11-22 6:12 ` [PATCH net 2/2] devlink: Make sure devlink instance and port are in same net namespace Parav Pandit
2020-11-25 9:16 ` [PATCH net v2 0/2] devlink port attribute fixes Parav Pandit
2020-11-25 9:16 ` [PATCH net v2 1/2] devlink: Hold rtnl lock while reading netdev attributes Parav Pandit
2020-11-25 9:16 ` Parav Pandit [this message]
2020-11-26 1:40 ` [PATCH net v2 0/2] devlink port attribute fixes patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201125091620.6781-3-parav@nvidia.com \
--to=parav@nvidia.com \
--cc=davem@davemloft.net \
--cc=jiri@nvidia.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).