Commit 993e1634 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jakub Kicinski
Browse files

bridge: move from strlcpy with unused retval to strscpy 

Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/


Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://lore.kernel.org/r/20220818210212.8347-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6164b5e3

net/bridge/br_device.c

+4 −4
Original line number Diff line number Diff line
@@ -251,10 +251,10 @@ static int br_set_mac_address(struct net_device *dev, void *p) 


static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info)

{

	strlcpy(info->driver, "bridge", sizeof(info->driver));

	strlcpy(info->version, BR_VERSION, sizeof(info->version));

	strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));

	strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));

	strscpy(info->driver, "bridge", sizeof(info->driver));

	strscpy(info->version, BR_VERSION, sizeof(info->version));

	strscpy(info->fw_version, "N/A", sizeof(info->fw_version));

	strscpy(info->bus_info, "N/A", sizeof(info->bus_info));

}



static int br_get_link_ksettings(struct net_device *dev,

net/bridge/br_sysfs_if.c

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ int br_sysfs_addif(struct net_bridge_port *p) 
			return err;

	}



	strlcpy(p->sysfs_name, p->dev->name, IFNAMSIZ);

	strscpy(p->sysfs_name, p->dev->name, IFNAMSIZ);

	return sysfs_create_link(br->ifobj, &p->kobj, p->sysfs_name);

}
@@ -406,7 +406,7 @@ int br_sysfs_renameif(struct net_bridge_port *p) 
		netdev_notice(br->dev, "unable to rename link %s to %s",

			      p->sysfs_name, p->dev->name);

	else

		strlcpy(p->sysfs_name, p->dev->name, IFNAMSIZ);

		strscpy(p->sysfs_name, p->dev->name, IFNAMSIZ);



	return err;

}

net/bridge/netfilter/ebtables.c

+1 −1
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ static inline int ebt_obj_to_user(char __user *um, const char *_name, 
	/* ebtables expects 31 bytes long names but xt_match names are 29 bytes

	 * long. Copy 29 bytes and fill remaining bytes with zeroes.

	 */

	strlcpy(name, _name, sizeof(name));

	strscpy(name, _name, sizeof(name));

	if (copy_to_user(um, name, EBT_EXTENSION_MAXNAMELEN) ||

	    put_user(revision, (u8 __user *)(um + EBT_EXTENSION_MAXNAMELEN)) ||

	    put_user(datasize, (int __user *)(um + EBT_EXTENSION_MAXNAMELEN + 1)) ||