Convert all users of strlcpy to strscpy
Subsystems (10)
cover Convert all users of strlcpy to strscpy
This series converts all existing users of strlcpy in drivers/staging to use strscpy instead.
strlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
The conversions were performed in two steps:
1. The following coccinelle script was used to identify and replace call sites that expect truncation.
$ spatch --sp-file strscpy.cocci --include-headers --dir --in-place drivers/staging
@strscpy@
expression dest, src, size;
@@
-strlcpy(dest, src, size);
+strscpy(dest, src, size);
2. Each individual automated conversion was rechecked manually for correctness.
Kumar Kartikeya Dwivedi (13):
staging: comedi: Switch from strlcpy to strscpy
staging: greybus: Switch from strlcpy to strscpy
staging: fsl-dpaa2: Switch from strlcpy to strscpy
staging: most: Switch from strlcpy to strscpy
staging: nvec: Switch from strlcpy to strscpy
staging: octeon: Switch from strlcpy to strscpy
staging: olpc_dcon: Switch from strlcpy to strscpy
staging: rtl8188eu: Switch from strlcpy to strscpy
staging: rtl8192e: Switch from strlcpy to strscpy
staging: rtl8192u: Switch from strlcpy to strscpy
staging: rtl8712: Switch from strlcpy to strscpy
staging: sm750fb: Switch from strlcpy to strscpy
staging: wimax: Switch from strlcpy to strscpy
drivers/staging/comedi/comedi_fops.c | 4 ++-- drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 6 +++--- drivers/staging/greybus/audio_helper.c | 2 +- drivers/staging/greybus/audio_module.c | 2 +- drivers/staging/greybus/audio_topology.c | 6 +++--- drivers/staging/greybus/power_supply.c | 2 +- drivers/staging/greybus/spilib.c | 4 ++-- drivers/staging/most/sound/sound.c | 2 +- drivers/staging/most/video/video.c | 6 +++--- drivers/staging/nvec/nvec_ps2.c | 4 ++-- drivers/staging/octeon/ethernet-mdio.c | 6 +++--- drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 +++--- drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- drivers/staging/sm750fb/sm750.c | 2 +- drivers/staging/wimax/i2400m/netdev.c | 6 +++--- drivers/staging/wimax/i2400m/usb.c | 4 ++-- 19 files changed, 35 insertions(+), 35 deletions(-)
Signature · 1 line
2.29.2
PATCH 1/13 staging: comedi: Switch from strlcpy to strscpy
strlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/comedi/comedi_fops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/comedi/comedi_fops.c +2 -2
@@ -939,8 +939,8 @@ static int do_devinfo_ioctl(struct comedi_device *dev,/* fill devinfo structure */ devinfo.version_code =COMEDI_VERSION_CODE ; devinfo.n_subdevs = dev->n_subdevices; -strlcpy (devinfo.driver_name, dev->driver->driver_name,COMEDI_NAMELEN ); -strlcpy (devinfo.board_name, dev->board_name,COMEDI_NAMELEN ); +strscpy (devinfo.driver_name, dev->driver->driver_name,COMEDI_NAMELEN ); +strscpy (devinfo.board_name, dev->board_name,COMEDI_NAMELEN ); s =comedi_file_read_subdevice (file);if (s)
Signature · 1 line
2.29.2
PATCH 2/13 staging: greybus: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/greybus/audio_helper.c | 2 +- drivers/staging/greybus/audio_module.c | 2 +- drivers/staging/greybus/audio_topology.c | 6 +++--- drivers/staging/greybus/power_supply.c | 2 +- drivers/staging/greybus/spilib.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/greybus/audio_helper.c +1 -1
@@ -166,7 +166,7 @@ static int gbaudio_remove_controls(struct snd_card *card, struct device *dev,snprintf (id.name,sizeof (id.name),"%s %s" , prefix, control->name); else - strlcpy(id.name, control->name, sizeof(id.name)); + strscpy(id.name, control->name, sizeof(id.name)); id.numid =0 ; id.iface = control->iface; id.device = control->device;
drivers/staging/greybus/audio_module.c +1 -1
@@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle,/* inform above layer for uevent */ dev_dbg (dev,"Inform set_event:%d to above layer\n" ,1 );/* prepare for the audio manager */ -strlcpy (desc.name, gbmodule->name,GB_AUDIO_MANAGER_MODULE_NAME_LEN ); +strscpy (desc.name, gbmodule->name,GB_AUDIO_MANAGER_MODULE_NAME_LEN ); desc.vid =2 ;/* todo */ desc.pid =3 ;/* todo */ desc.intf_id = gbmodule->dev_id;
drivers/staging/greybus/audio_topology.c +3 -3
@@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,return -EINVAL ; name =gbaudio_map_controlid (module, data->ctl_id, uinfo->value.enumerated.item); -strlcpy (uinfo->value.enumerated.name, name,NAME_SIZE ); +strscpy (uinfo->value.enumerated.name, name,NAME_SIZE );break ;default : dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n",
@@ -1047,7 +1047,7 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, }/* Prefix dev_id to widget control_name */ -strlcpy (temp_name, w->name,NAME_SIZE ); +strscpy (temp_name, w->name,NAME_SIZE );snprintf (w->name,NAME_SIZE ,"GB %d %s" , module->dev_id, temp_name);switch (w->type) {
@@ -1169,7 +1169,7 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, } control->id = curr->id;/* Prefix dev_id to widget_name */ -strlcpy (temp_name, curr->name,NAME_SIZE ); +strscpy (temp_name, curr->name,NAME_SIZE );snprintf (curr->name,NAME_SIZE ,"GB %d %s" , module->dev_id, temp_name); control->name = curr->name;
drivers/staging/greybus/power_supply.c +1 -1
@@ -449,7 +449,7 @@ static int __gb_power_supply_set_name(char *init_name, char *name, size_t len)if (!strlen (init_name)) init_name ="gb_power_supply" ; -strlcpy (name, init_name, len); +strscpy (name, init_name, len);while ((ret < len) && (psy =power_supply_get_by_name (name))) {power_supply_put (psy);
drivers/staging/greybus/spilib.c +2 -2
@@ -455,10 +455,10 @@ static int gb_spi_setup_device(struct gb_spilib *spi, u8 cs) dev_type = response.device_type;if (dev_type ==GB_SPI_SPI_DEV ) -strlcpy (spi_board.modalias,"spidev" , +strscpy (spi_board.modalias,"spidev" ,sizeof (spi_board.modalias));else if (dev_type ==GB_SPI_SPI_NOR ) -strlcpy (spi_board.modalias,"spi-nor" , +strscpy (spi_board.modalias,"spi-nor" ,sizeof (spi_board.modalias));else if (dev_type ==GB_SPI_SPI_MODALIAS ) memcpy(spi_board.modalias, response.name,
Signature · 1 line
2.29.2
Re: [PATCH 02/13] staging: greybus: Switch from strlcpy to strscpy
Quoted 9 lines · Kumar Kartikeya Dwivedi
strlcpy is marked as deprecated in
Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.This silences the related checkpatch warnings from:
5dbdb2d87c29("checkpatch: prefer strscpy to strlcpy")Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>
This is a good change. But while you're at it, I would appreciate if you would convert a few spots to use sizeof(dest) rather than a fixed constant. I will point them out below.
If this is the *only* request for a change on your series, please tell me that and I can sign off on this without you implementing my suggestion. But if you post a version 2, please do what I describe.
Thanks.
-Alex
Quoted 7 lines
--- drivers/staging/greybus/audio_helper.c | 2 +- drivers/staging/greybus/audio_module.c | 2 +- drivers/staging/greybus/audio_topology.c | 6 +++--- drivers/staging/greybus/power_supply.c | 2 +- drivers/staging/greybus/spilib.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
. . .
drivers/staging/greybus/audio_module.c static int gb_audio_probe(struct gb_bundle *bundle, · line 345
Quoted 10 lines
drivers/staging/greybus/audio_module.c +1
-1@@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle,/* inform above layer for uevent */ dev_dbg (dev,"Inform set_event:%d to above layer\n" ,1 );/* prepare for the audio manager */ -strlcpy (desc.name, gbmodule->name,GB_AUDIO_MANAGER_MODULE_NAME_LEN ); +strscpy (desc.name, gbmodule->name,GB_AUDIO_MANAGER_MODULE_NAME_LEN );
Please use this here instead:
strscpy(desc.name, gbmodule->name, sizeof(desc.name));
drivers/staging/greybus/audio_topology.c static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol, · line 203
Quoted 13 lines
drivers/staging/greybus/audio_module.c +0
-0desc.vid =2 ;/* todo */ desc.pid =3 ;/* todo */ desc.intf_id = gbmodule->dev_id;drivers/staging/greybus/audio_topology.c +1
-1@@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,return -EINVAL ; name =gbaudio_map_controlid (module, data->ctl_id, uinfo->value.enumerated.item); -strlcpy (uinfo->value.enumerated.name, name,NAME_SIZE ); +strscpy (uinfo->value.enumerated.name, name,NAME_SIZE );
Please use this here instead:
strscpy(uinfo->value.enumerated.name, name, sizeof(uinfo->valiue.enumerated.name));
(I know NAME_SIZE is used throughout this file, and could also be converted in this way, but we can save that for another patch.)
drivers/staging/greybus/audio_topology.c static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, · line 1050
Quoted 9 lines
drivers/staging/greybus/audio_topology.c +1
-1break ;default : dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n",@@ -1047,7 +1047,7 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, }/* Prefix dev_id to widget control_name */ -strlcpy (temp_name, w->name,NAME_SIZE ); +strscpy (temp_name, w->name,NAME_SIZE );
Please use this here instead:
strscpy(temp_name, w->name, sizeof(temp_name));
drivers/staging/greybus/audio_topology.c static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, · line 1172
Quoted 9 lines
drivers/staging/greybus/audio_topology.c +1
-1snprintf (w->name,NAME_SIZE ,"GB %d %s" , module->dev_id, temp_name);switch (w->type) {@@ -1169,7 +1169,7 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, } control->id = curr->id;/* Prefix dev_id to widget_name */ -strlcpy (temp_name, curr->name,NAME_SIZE ); +strscpy (temp_name, curr->name,NAME_SIZE );
Please use this here instead:
strscpy(temp_name, curr->name, sizeof(temp_name));
drivers/staging/greybus/audio_topology.c static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, · line 1175
Quoted 3 lines
drivers/staging/greybus/audio_topology.c +0
-0snprintf (curr->name,NAME_SIZE ,"GB %d %s" , module->dev_id, temp_name); control->name = curr->name;
. . .
Re: [PATCH 02/13] staging: greybus: Switch from strlcpy to strscpy
Quoted 7 lines · Alex Elder
This is a good change. But while you're at it, I would appreciate if you would convert a few spots to use sizeof(dest) rather than a fixed constant. I will point them out below.
If this is the *only* request for a change on your series, please tell me that and I can sign off on
So far, this has been the only request.
Quoted 3 lines
this without you implementing my suggestion. But if you post a version 2, please do what I describe.
I will incorporate these if I end up sending a v2.
Alternatively, would a separate patch with your suggestions applied on top of this be acceptable, if I don't?
Signature · 1 line
Kartikeya
Alex Elder
Reviewed-byRe: [PATCH 02/13] staging: greybus: Switch from strlcpy to strscpy
Quoted 11 lines · Kumar Kartikeya Dwivedi
Quoted 7 lines · Alex Elder
This is a good change. But while you're at it, I would appreciate if you would convert a few spots to use sizeof(dest) rather than a fixed constant. I will point them out below.
If this is the *only* request for a change on your series, please tell me that and I can sign off on
So far, this has been the only request.
Quoted 8 lines
Quoted 3 lines
this without you implementing my suggestion. But if you post a version 2, please do what I describe.
I will incorporate these if I end up sending a v2.
Alternatively, would a separate patch with your suggestions applied on top of this be acceptable, if I don't?
Yes. Assuming you do that, for this patch (as-is):
PATCH 1/1 staging/greybus: eliminate use of NAME_SIZE for strings
In reply to Alex ElderInstead, depend on the size of the destination buffer for easier refactoring.
---
Hopefully, this is more thorough. The only cases left now are where the destination string is represented by a pointer, otherwise all call sites with a fixed sized buffer have been changed.
--- drivers/staging/greybus/audio_module.c | 4 ++-- drivers/staging/greybus/audio_topology.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/staging/greybus/audio_module.c +2 -2
@@ -260,7 +260,7 @@ static int gb_audio_probe(struct gb_bundle *bundle,INIT_LIST_HEAD (&gbmodule->widget_ctl_list);INIT_LIST_HEAD (&gbmodule->jack_list); gbmodule->dev = dev; -snprintf (gbmodule->name,NAME_SIZE ,"%s.%s" , dev->driver->name, +snprintf (gbmodule->name,sizeof (gbmodule->name),"%s.%s" , dev->driver->name,dev_name (dev));greybus_set_drvdata (bundle, gbmodule);
@@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle,/* inform above layer for uevent */ dev_dbg (dev,"Inform set_event:%d to above layer\n" ,1 );/* prepare for the audio manager */ -strscpy (desc.name, gbmodule->name,GB_AUDIO_MANAGER_MODULE_NAME_LEN ); +strscpy (desc.name, gbmodule->name,sizeof (desc.name)); desc.vid =2 ;/* todo */ desc.pid =3 ;/* todo */ desc.intf_id = gbmodule->dev_id;
drivers/staging/greybus/audio_topology.c +6 -6
@@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,return -EINVAL ; name =gbaudio_map_controlid (module, data->ctl_id, uinfo->value.enumerated.item); -strscpy (uinfo->value.enumerated.name, name,NAME_SIZE ); +strscpy (uinfo->value.enumerated.name, name,sizeof (uinfo->value.enumerated.name));break ;default : dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n",
@@ -363,7 +363,7 @@ static int gbcodec_mixer_dapm_ctl_info(struct snd_kcontrol *kcontrol, platform_min =le32_to_cpu (info->value.integer.min);if (platform_max ==1 && - !strnstr (kcontrol->id.name," Volume" ,NAME_SIZE )) + !strnstr (kcontrol->id.name," Volume" ,sizeof (kcontrol->id.name))) uinfo->type =SNDRV_CTL_ELEM_TYPE_BOOLEAN ;else uinfo->type =SNDRV_CTL_ELEM_TYPE_INTEGER ;
@@ -1047,8 +1047,8 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, }/* Prefix dev_id to widget control_name */ -strscpy (temp_name, w->name,NAME_SIZE ); -snprintf (w->name,NAME_SIZE ,"GB %d %s" , module->dev_id, temp_name); +strscpy (temp_name, w->name,sizeof (temp_name)); +snprintf (w->name,sizeof (w->name),"GB %d %s" , module->dev_id, temp_name);switch (w->type) {case snd_soc_dapm_spk:
@@ -1169,8 +1169,8 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, } control->id = curr->id;/* Prefix dev_id to widget_name */ -strscpy (temp_name, curr->name,NAME_SIZE ); -snprintf (curr->name,NAME_SIZE ,"GB %d %s" , module->dev_id, +strscpy (temp_name, curr->name,sizeof (temp_name)); +snprintf (curr->name,sizeof (curr->name),"GB %d %s" , module->dev_id, temp_name); control->name = curr->name;if (curr->info.type ==GB_AUDIO_CTL_ELEM_TYPE_ENUMERATED ) {
Signature · 1 line
2.29.2
PATCH 3/13 staging: fsl-dpaa2: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c +3 -3
@@ -38,19 +38,19 @@ static void dpaa2_switch_get_drvinfo(struct net_device *netdev,u16 version_major, version_minor;int err; -strlcpy (drvinfo->driver,KBUILD_MODNAME ,sizeof (drvinfo->driver)); +strscpy (drvinfo->driver,KBUILD_MODNAME ,sizeof (drvinfo->driver)); err =dpsw_get_api_version (port_priv->ethsw_data->mc_io,0 , &version_major, &version_minor);if (err) -strlcpy (drvinfo->fw_version,"N/A" , +strscpy (drvinfo->fw_version,"N/A" ,sizeof (drvinfo->fw_version));else snprintf (drvinfo->fw_version,sizeof (drvinfo->fw_version),"%u.%u" , version_major, version_minor); -strlcpy (drvinfo->bus_info,dev_name (netdev->dev.parent->parent), +strscpy (drvinfo->bus_info,dev_name (netdev->dev.parent->parent),sizeof (drvinfo->bus_info)); }
Signature · 1 line
2.29.2
PATCH 4/13 staging: most: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/most/sound/sound.c | 2 +- drivers/staging/most/video/video.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/most/sound/sound.c +1 -1
@@ -525,7 +525,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,pr_err ("Incompatible channel type\n" );return -EINVAL ; } -strlcpy (arg_list_cpy, arg_list,STRING_SIZE ); +strscpy (arg_list_cpy, arg_list,STRING_SIZE ); ret =split_arg_list (arg_list_cpy, &ch_num, &sample_res);if (ret <0 )return ret;
drivers/staging/most/video/video.c +3 -3
@@ -245,8 +245,8 @@ static int vidioc_querycap(struct file *file, void *priv,struct comp_fh *fh = priv;struct most_video_dev *mdev = fh->mdev; -strlcpy (cap->driver,"v4l2_component" ,sizeof (cap->driver)); -strlcpy (cap->card,"MOST" ,sizeof (cap->card)); +strscpy (cap->driver,"v4l2_component" ,sizeof (cap->driver)); +strscpy (cap->card,"MOST" ,sizeof (cap->card));snprintf (cap->bus_info,sizeof (cap->bus_info),"%s" , mdev->iface->description);return 0 ;
@@ -483,7 +483,7 @@ static int comp_probe_channel(struct most_interface *iface, int channel_idx, mdev->v4l2_dev.release = comp_v4l2_dev_release;/* Create the v4l2_device */ -strlcpy (mdev->v4l2_dev.name, name,sizeof (mdev->v4l2_dev.name)); +strscpy (mdev->v4l2_dev.name, name,sizeof (mdev->v4l2_dev.name)); ret =v4l2_device_register (NULL , &mdev->v4l2_dev);if (ret) {pr_err ("v4l2_device_register() failed\n" );
Signature · 1 line
2.29.2
PATCH 5/13 staging: nvec: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/nvec/nvec_ps2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/nvec/nvec_ps2.c +2 -2
@@ -112,8 +112,8 @@ static int nvec_mouse_probe(struct platform_device *pdev) ser_dev->start = ps2_startstreaming; ser_dev->stop = ps2_stopstreaming; -strlcpy (ser_dev->name,"nvec mouse" ,sizeof (ser_dev->name)); -strlcpy (ser_dev->phys,"nvec" ,sizeof (ser_dev->phys)); +strscpy (ser_dev->name,"nvec mouse" ,sizeof (ser_dev->name)); +strscpy (ser_dev->phys,"nvec" ,sizeof (ser_dev->phys)); ps2_dev.ser_dev = ser_dev; ps2_dev.notifier.notifier_call = nvec_ps2_notifier;
Signature · 1 line
2.29.2
Re: [PATCH 05/13] staging: nvec: Switch from strlcpy to strscpy
Hi Kumar,
Quoted 18 lines · Kumar Kartikeya Dwivedi
strlcpy is marked as deprecated in
Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.This silences the related checkpatch warnings from:
5dbdb2d87c29("checkpatch: prefer strscpy to strlcpy")Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>---
drivers/staging/nvec/nvec_ps2.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/nvec/nvec_ps2.c +0
-0
drivers/staging/nvec/nvec_ps2.c static int nvec_mouse_probe(struct platform_device *pdev) · line 116
Quoted 7 lines
drivers/staging/nvec/nvec_ps2.c +2
-2@@ -112,8 +112,8 @@ static int nvec_mouse_probe(struct platform_device *pdev) ser_dev->start = ps2_startstreaming; ser_dev->stop = ps2_stopstreaming; -strlcpy (ser_dev->name,"nvec mouse" ,sizeof (ser_dev->name)); -strlcpy (ser_dev->phys,"nvec" ,sizeof (ser_dev->phys)); +strscpy (ser_dev->name,"nvec mouse" ,sizeof (ser_dev->name)); +strscpy (ser_dev->phys,"nvec" ,sizeof (ser_dev->phys));
lgtm, so
Thanks!
Marc
PATCH 6/13 staging: octeon: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/octeon/ethernet-mdio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/octeon/ethernet-mdio.c +3 -3
@@ -21,9 +21,9 @@static void cvm_oct_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -strlcpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); -strlcpy (info->version,UTS_RELEASE ,sizeof (info->version)); -strlcpy (info->bus_info,"Builtin" ,sizeof (info->bus_info)); +strscpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); +strscpy (info->version,UTS_RELEASE ,sizeof (info->version)); +strscpy (info->bus_info,"Builtin" ,sizeof (info->bus_info)); }static int cvm_oct_nway_reset (struct net_device *dev)
Signature · 1 line
2.29.2
Re: [PATCH 06/13] staging: octeon: Switch from strlcpy to strscpy
Quoted 5 lines · Kumar Kartikeya Dwivedi
strlcpy is marked as deprecated in
Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
Quoted 7 lines
This silences the related checkpatch warnings from:
5dbdb2d87c29("checkpatch: prefer strscpy to strlcpy")Signed-off-by Kumar Kartikeya Dwivedi <[email protected]>--- drivers/staging/octeon/ethernet-mdio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
PATCH 7/13 staging: olpc_dcon: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/olpc_dcon/olpc_dcon.c +1 -1
@@ -576,7 +576,7 @@ static struct notifier_block dcon_panic_nb = {static int dcon_detect (struct i2c_client *client,struct i2c_board_info *info) { -strlcpy (info->type,"olpc_dcon" ,I2C_NAME_SIZE ); +strscpy (info->type,"olpc_dcon" ,I2C_NAME_SIZE );return 0 ; }
Signature · 1 line
2.29.2
PATCH 8/13 staging: rtl8188eu: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
@@ -1865,7 +1865,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, goto exit; } -strlcpy ((char *)param->u.crypt.alg, alg_name,IEEE_CRYPT_ALG_NAME_LEN ); +strscpy ((char *)param->u.crypt.alg, alg_name,IEEE_CRYPT_ALG_NAME_LEN );if (pext->ext_flags &IW_ENCODE_EXT_SET_TX_KEY ) param->u.crypt.set_tx =1 ;
Signature · 1 line
2.29.2
PATCH 9/13 staging: rtl8192e: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c +3 -3
@@ -18,9 +18,9 @@ static void _rtl92e_ethtool_get_drvinfo(struct net_device *dev, {struct r8192_priv *priv =rtllib_priv (dev); -strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); -strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); -strlcpy (info->bus_info,pci_name (priv->pdev),sizeof (info->bus_info)); +strscpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strscpy (info->version,DRV_VERSION ,sizeof (info->version)); +strscpy (info->bus_info,pci_name (priv->pdev),sizeof (info->bus_info)); }static u32 _rtl92e_ethtool_get_link (struct net_device *dev)
Signature · 1 line
2.29.2
PATCH 10/13 staging: rtl8192u: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c +1 -1
@@ -484,7 +484,7 @@ int ieee80211_wx_get_name(struct ieee80211_device *ieee,struct iw_request_info *info, union iwreq_data *wrqu, char *extra) { - strlcpy(wrqu->name, "802.11", IFNAMSIZ); + strscpy(wrqu->name, "802.11", IFNAMSIZ);if (ieee->modulation &IEEE80211_CCK_MODULATION ) {strlcat (wrqu->name,"b" ,IFNAMSIZ );if (ieee->modulation &IEEE80211_OFDM_MODULATION )
Signature · 1 line
2.29.2
PATCH 11/13 staging: rtl8712: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +1 -1
@@ -1784,7 +1784,7 @@ static int r871x_wx_set_enc_ext(struct net_device *dev,return -ENOMEM ; param->cmd =IEEE_CMD_SET_ENCRYPTION ;eth_broadcast_addr (param->sta_addr); -strlcpy ((char *)param->u.crypt.alg, alg_name,IEEE_CRYPT_ALG_NAME_LEN ); +strscpy ((char *)param->u.crypt.alg, alg_name,IEEE_CRYPT_ALG_NAME_LEN );if (pext->ext_flags &IW_ENCODE_EXT_GROUP_KEY ) param->u.crypt.set_tx =0 ;if (pext->ext_flags &IW_ENCODE_EXT_SET_TX_KEY )
Signature · 1 line
2.29.2
PATCH 12/13 staging: sm750fb: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/sm750fb/sm750.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/sm750fb/sm750.c +1 -1
@@ -814,7 +814,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) fix->ywrapstep = crtc->ywrapstep; fix->accel =FB_ACCEL_SMI ; -strlcpy (fix->id, fixId[index],sizeof (fix->id)); +strscpy (fix->id, fixId[index],sizeof (fix->id)); fix->smem_start = crtc->oScreen + sm750_dev->vidmem_start;pr_info ("fix->smem_start = %lx\n" , fix->smem_start);
Signature · 1 line
2.29.2
PATCH 13/13 staging: wimax: Switch from strlcpy to strscpy
In reply to Kumar Kartikeya Dwivedistrlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string.
This silences the related checkpatch warnings from:5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")
--- drivers/staging/wimax/i2400m/netdev.c | 6 +++--- drivers/staging/wimax/i2400m/usb.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/wimax/i2400m/netdev.c +3 -3
@@ -561,11 +561,11 @@ static void i2400m_get_drvinfo(struct net_device *net_dev, {struct i2400m *i2400m =net_dev_to_i2400m (net_dev); -strlcpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); -strlcpy (info->fw_version, i2400m->fw_name ? :"" , +strscpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); +strscpy (info->fw_version, i2400m->fw_name ? :"" ,sizeof (info->fw_version));if (net_dev->dev.parent) -strlcpy (info->bus_info,dev_name (net_dev->dev.parent), +strscpy (info->bus_info,dev_name (net_dev->dev.parent),sizeof (info->bus_info)); }
drivers/staging/wimax/i2400m/usb.c +2 -2
@@ -333,8 +333,8 @@ static void i2400mu_get_drvinfo(struct net_device *net_dev, struct i2400mu *i2400mu = container_of(i2400m, struct i2400mu, i2400m);struct usb_device *udev = i2400mu->usb_dev; -strlcpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); -strlcpy (info->fw_version, i2400m->fw_name ? :"" , +strscpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); +strscpy (info->fw_version, i2400m->fw_name ? :"" ,sizeof (info->fw_version));usb_make_path (udev, info->bus_info,sizeof (info->bus_info)); }
Signature · 1 line
2.29.2