Skip to contentSkip to conversation

net/core: Do not clear VF index for node/port GUIDs query

PATCH In review Leon Romanovsky 2 participants 2 messages Jan 30, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/core: Do not clear VF index for node/port GUIDs query

From: Leon Romanovsky <[email protected]>

VF numbers were assigned to node_guid and port_guid, but cleared right before such query calls were issued. It caused to return node/port GUIDs of VF index 0 for all VFs.

Fixes 30aad41721e0 ("net/core: Add support for getting VF GUIDs")
---
 net/core/rtnetlink.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/rtnetlink.c +2 -2
index cdad6ed532c4..09c44bf2e1d2 100644
@@ -1242,6 +1242,8 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
 		return 0;
 
 	memset(&vf_vlan_info, 0, sizeof(vf_vlan_info));
+	memset(&node_guid, 0, sizeof(node_guid));
+	memset(&port_guid, 0, sizeof(port_guid));
 
 	vf_mac.vf =
 		vf_vlan.vf =
@@ -1290,8 +1292,6 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
 		    sizeof(vf_trust), &vf_trust))
 		goto nla_put_vf_failure;
 
-	memset(&node_guid, 0, sizeof(node_guid));
-	memset(&port_guid, 0, sizeof(port_guid));
 	if (dev->netdev_ops->ndo_get_vf_guid &&
 	    !dev->netdev_ops->ndo_get_vf_guid(dev, vfs_num, &node_guid,
 					      &port_guid)) {

--
2.24.1

maintainer
#1 lore raw

From: Leon Romanovsky <[email protected]>
Date: Thu, 30 Jan 2020 14:59:49 +0200

Quoted 9 lines

From: Leon Romanovsky <[email protected]>

VF numbers were assigned to node_guid and port_guid, but cleared right before such query calls were issued. It caused to return node/port GUIDs of VF index 0 for all VFs.

Fixes 30aad41721e0 ("net/core: Add support for getting VF GUIDs")

Looks good, applied and queued up for -stable.