Commit a9f08ad7 authored by Wolfram Sang's avatar Wolfram Sang Committed by Dmitry Torokhov
Browse files

Input: 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.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220818210022.6865-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 24c06e00

drivers/input/keyboard/lkkbd.c

+4 −4
Original line number Diff line number Diff line
@@ -359,18 +359,18 @@ static void lkkbd_detection_done(struct lkkbd *lk) 
	 */

	switch (lk->id[4]) {

	case 1:

		strlcpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name));

		strscpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name));



		if (lk201_compose_is_alt)

			lk->keycode[0xb1] = KEY_LEFTALT;

		break;



	case 2:

		strlcpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name));

		strscpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name));

		break;



	default:

		strlcpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name));

		strscpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name));

		printk(KERN_ERR

			"lkkbd: keyboard on %s is unknown, please report to "

			"Jan-Benedict Glaw <jbglaw@lug-owl.de>\n", lk->phys);
@@ -626,7 +626,7 @@ static int lkkbd_connect(struct serio *serio, struct serio_driver *drv) 
	lk->ctrlclick_volume = ctrlclick_volume;

	memcpy(lk->keycode, lkkbd_keycode, sizeof(lk->keycode));



	strlcpy(lk->name, "DEC LK keyboard", sizeof(lk->name));

	strscpy(lk->name, "DEC LK keyboard", sizeof(lk->name));

	snprintf(lk->phys, sizeof(lk->phys), "%s/input0", serio->phys);



	input_dev->name = lk->name;

drivers/input/misc/keyspan_remote.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static int keyspan_probe(struct usb_interface *interface, const struct usb_devic 
	}



	if (udev->manufacturer)

		strlcpy(remote->name, udev->manufacturer, sizeof(remote->name));

		strscpy(remote->name, udev->manufacturer, sizeof(remote->name));



	if (udev->product) {

		if (udev->manufacturer)

drivers/input/mouse/hgpk.c

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ void hgpk_module_init(void) 
						strlen(hgpk_mode_name));

	if (hgpk_default_mode == HGPK_MODE_INVALID) {

		hgpk_default_mode = HGPK_MODE_MOUSE;

		strlcpy(hgpk_mode_name, hgpk_mode_names[HGPK_MODE_MOUSE],

		strscpy(hgpk_mode_name, hgpk_mode_names[HGPK_MODE_MOUSE],

			sizeof(hgpk_mode_name));

	}

}

drivers/input/mouse/synaptics.c

+2 −2
Original line number Diff line number Diff line
@@ -715,8 +715,8 @@ static void synaptics_pt_create(struct psmouse *psmouse) 
	}



	serio->id.type = SERIO_PS_PSTHRU;

	strlcpy(serio->name, "Synaptics pass-through", sizeof(serio->name));

	strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->phys));

	strscpy(serio->name, "Synaptics pass-through", sizeof(serio->name));

	strscpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->phys));

	serio->write = synaptics_pt_write;

	serio->start = synaptics_pt_start;

	serio->stop = synaptics_pt_stop;

drivers/input/mouse/synaptics_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ static int synusb_probe(struct usb_interface *intf, 
	synusb->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;



	if (udev->manufacturer)

		strlcpy(synusb->name, udev->manufacturer,

		strscpy(synusb->name, udev->manufacturer,

			sizeof(synusb->name));



	if (udev->product) {