Skip to contentSkip to conversation

vxcan: improve handling of missing peer name attribute

PATCH Applied Oliver Hartkopp 2 participants 2 messages Dec 2, 2017 – Dec 11, 2017 CAN network drivers

lore
Share & tools
lore

Oliver Hartkopp

author
#0 lore raw

PATCH 1/1 vxcan: improve handling of missing peer name attribute

Picking up the patch from Serhey Popovych (commit 191cdb3822e5df6b3c8, "veth: Be more robust on network device creation when no attributes").

When the peer name attribute is not provided the former implementation tries to register the given device name twice ... which leads to -EEXIST. If only one device name is given apply an automatic generated and valid name for the peer.

CC Serhey Popovych <[email protected]>
Signed-off-by Oliver Hartkopp <[email protected]>
---
 drivers/net/can/vxcan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/can/vxcan.c +1 -1
index 8404e8852a0f..b4c4a2c76437 100644
@@ -194,7 +194,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,
 		tbp = peer_tb;
 	}
 
-	if (tbp[IFLA_IFNAME]) {
+	if (ifmp && tbp[IFLA_IFNAME]) {
 		nla_strlcpy(ifname, tbp[IFLA_IFNAME], IFNAMSIZ);
 		name_assign_type = NET_NAME_USER;
 	} else {
Signature · 1 line
2.15.0
maintainer Applied
#1 lore raw
Quoted 10 lines · Oliver Hartkopp

Picking up the patch from Serhey Popovych (commit 191cdb3822e5df6b3c8, "veth: Be more robust on network device creation when no attributes").

When the peer name attribute is not provided the former implementation tries to register the given device name twice ... which leads to -EEXIST. If only one device name is given apply an automatic generated and valid name for the peer.

CC Serhey Popovych <[email protected]>
Signed-off-by Oliver Hartkopp <[email protected]>

Applied to can.

tnx,
Marc

Signature · 4 lines
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |