Input: move from strlcpy with unused retval to strscpy

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220818210022.6865-1-wsa+renesas@sang-engineering.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Wolfram Sang and committed by

Dmitry Torokhov 3 years ago a9f08ad7 24c06e00

+76 -76

35 changed files

expand all collapse all

drivers

input

keyboard

lkkbd.c

misc

keyspan_remote.c

mouse

hgpk.c

synaptics.c

synaptics_usb.c

vsxxxaa.c

rmi4

rmi_f03.c

rmi_f54.c

serio

altera_ps2.c

ambakmi.c

ams_delta_serio.c

apbps2.c

ct82c710.c

gscps2.c

hyperv-keyboard.c

i8042-x86ia64io.h

i8042.c

olpc_apsp.c

parkbd.c

pcips2.c

ps2-gpio.c

ps2mult.c

q40kbd.c

rpckbd.c

sa1111ps2.c

serport.c

sun4i-ps2.c

tablet

acecad.c

hanwang.c

pegasus_notetaker.c

touchscreen

atmel_mxt_ts.c

edt-ft5x06.c

sur40.c

usbtouchscreen.c

wacom_w8001.c

+4 -4

drivers/input/keyboard/lkkbd.c

reviewed

··· 359 359 */ 360 360 switch (lk->id[4]) { 361 361 case 1: 362 362 - strlcpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name)); 362 362 + strscpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name)); 363 363 364 364 if (lk201_compose_is_alt) 365 365 lk->keycode[0xb1] = KEY_LEFTALT; 366 366 break; 367 367 368 368 case 2: 369 369 - strlcpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name)); 369 369 + strscpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name)); 370 370 break; 371 371 372 372 default: 373 373 - strlcpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name)); 373 373 + strscpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name)); 374 374 printk(KERN_ERR 375 375 "lkkbd: keyboard on %s is unknown, please report to " 376 376 "Jan-Benedict Glaw <jbglaw@lug-owl.de>\n", lk->phys); ··· 626 626 lk->ctrlclick_volume = ctrlclick_volume; 627 627 memcpy(lk->keycode, lkkbd_keycode, sizeof(lk->keycode)); 628 628 629 629 - strlcpy(lk->name, "DEC LK keyboard", sizeof(lk->name)); 629 629 + strscpy(lk->name, "DEC LK keyboard", sizeof(lk->name)); 630 630 snprintf(lk->phys, sizeof(lk->phys), "%s/input0", serio->phys); 631 631 632 632 input_dev->name = lk->name;

+1 -1

drivers/input/misc/keyspan_remote.c

reviewed

··· 485 485 } 486 486 487 487 if (udev->manufacturer) 488 488 - strlcpy(remote->name, udev->manufacturer, sizeof(remote->name)); 488 488 + strscpy(remote->name, udev->manufacturer, sizeof(remote->name)); 489 489 490 490 if (udev->product) { 491 491 if (udev->manufacturer)

+1 -1

drivers/input/mouse/hgpk.c

reviewed

··· 1057 1057 strlen(hgpk_mode_name)); 1058 1058 if (hgpk_default_mode == HGPK_MODE_INVALID) { 1059 1059 hgpk_default_mode = HGPK_MODE_MOUSE; 1060 1060 - strlcpy(hgpk_mode_name, hgpk_mode_names[HGPK_MODE_MOUSE], 1060 1060 + strscpy(hgpk_mode_name, hgpk_mode_names[HGPK_MODE_MOUSE], 1061 1061 sizeof(hgpk_mode_name)); 1062 1062 } 1063 1063 }

+2 -2

drivers/input/mouse/synaptics.c

reviewed

··· 715 715 } 716 716 717 717 serio->id.type = SERIO_PS_PSTHRU; 718 718 - strlcpy(serio->name, "Synaptics pass-through", sizeof(serio->name)); 719 719 - strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->phys)); 718 718 + strscpy(serio->name, "Synaptics pass-through", sizeof(serio->name)); 719 719 + strscpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->phys)); 720 720 serio->write = synaptics_pt_write; 721 721 serio->start = synaptics_pt_start; 722 722 serio->stop = synaptics_pt_stop;

+1 -1

drivers/input/mouse/synaptics_usb.c

reviewed

··· 354 354 synusb->urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 355 355 356 356 if (udev->manufacturer) 357 357 - strlcpy(synusb->name, udev->manufacturer, 357 357 + strscpy(synusb->name, udev->manufacturer, 358 358 sizeof(synusb->name)); 359 359 360 360 if (udev->product) {

+2 -2

drivers/input/mouse/vsxxxaa.c

reviewed

··· 138 138 { 139 139 switch (mouse->type) { 140 140 case 0x02: 141 141 - strlcpy(mouse->name, "DEC VSXXX-AA/-GA mouse", 141 141 + strscpy(mouse->name, "DEC VSXXX-AA/-GA mouse", 142 142 sizeof(mouse->name)); 143 143 break; 144 144 145 145 case 0x04: 146 146 - strlcpy(mouse->name, "DEC VSXXX-AB digitizer", 146 146 + strscpy(mouse->name, "DEC VSXXX-AB digitizer", 147 147 sizeof(mouse->name)); 148 148 break; 149 149

+1 -1

drivers/input/rmi4/rmi_f03.c

reviewed

··· 181 181 serio->close = rmi_f03_pt_close; 182 182 serio->port_data = f03; 183 183 184 184 - strlcpy(serio->name, "RMI4 PS/2 pass-through", sizeof(serio->name)); 184 184 + strscpy(serio->name, "RMI4 PS/2 pass-through", sizeof(serio->name)); 185 185 snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", 186 186 dev_name(&f03->fn->dev)); 187 187 serio->dev.parent = &f03->fn->dev;

+4 -4

drivers/input/rmi4/rmi_f54.c

reviewed

··· 390 390 { 391 391 struct f54_data *f54 = video_drvdata(file); 392 392 393 393 - strlcpy(cap->driver, F54_NAME, sizeof(cap->driver)); 394 394 - strlcpy(cap->card, SYNAPTICS_INPUT_DEVICE_NAME, sizeof(cap->card)); 393 393 + strscpy(cap->driver, F54_NAME, sizeof(cap->driver)); 394 394 + strscpy(cap->card, SYNAPTICS_INPUT_DEVICE_NAME, sizeof(cap->card)); 395 395 snprintf(cap->bus_info, sizeof(cap->bus_info), 396 396 "rmi4:%s", dev_name(&f54->fn->dev)); 397 397 ··· 410 410 411 411 i->type = V4L2_INPUT_TYPE_TOUCH; 412 412 413 413 - strlcpy(i->name, rmi_f54_report_type_names[reptype], sizeof(i->name)); 413 413 + strscpy(i->name, rmi_f54_report_type_names[reptype], sizeof(i->name)); 414 414 return 0; 415 415 } 416 416 ··· 696 696 rmi_f54_set_input(f54, 0); 697 697 698 698 /* register video device */ 699 699 - strlcpy(f54->v4l2.name, F54_NAME, sizeof(f54->v4l2.name)); 699 699 + strscpy(f54->v4l2.name, F54_NAME, sizeof(f54->v4l2.name)); 700 700 ret = v4l2_device_register(&fn->dev, &f54->v4l2); 701 701 if (ret) { 702 702 dev_err(&fn->dev, "Unable to register video dev.\n");

+2 -2

drivers/input/serio/altera_ps2.c

reviewed

··· 110 110 serio->write = altera_ps2_write; 111 111 serio->open = altera_ps2_open; 112 112 serio->close = altera_ps2_close; 113 113 - strlcpy(serio->name, dev_name(&pdev->dev), sizeof(serio->name)); 114 114 - strlcpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); 113 113 + strscpy(serio->name, dev_name(&pdev->dev), sizeof(serio->name)); 114 114 + strscpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); 115 115 serio->port_data = ps2if; 116 116 serio->dev.parent = &pdev->dev; 117 117 ps2if->io = serio;

+2 -2

drivers/input/serio/ambakmi.c

reviewed

··· 126 126 io->write = amba_kmi_write; 127 127 io->open = amba_kmi_open; 128 128 io->close = amba_kmi_close; 129 129 - strlcpy(io->name, dev_name(&dev->dev), sizeof(io->name)); 130 130 - strlcpy(io->phys, dev_name(&dev->dev), sizeof(io->phys)); 129 129 + strscpy(io->name, dev_name(&dev->dev), sizeof(io->name)); 130 130 + strscpy(io->phys, dev_name(&dev->dev), sizeof(io->phys)); 131 131 io->port_data = kmi; 132 132 io->dev.parent = &dev->dev; 133 133

+2 -2

drivers/input/serio/ams_delta_serio.c

reviewed

··· 159 159 serio->id.type = SERIO_8042; 160 160 serio->open = ams_delta_serio_open; 161 161 serio->close = ams_delta_serio_close; 162 162 - strlcpy(serio->name, "AMS DELTA keyboard adapter", sizeof(serio->name)); 163 163 - strlcpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); 162 162 + strscpy(serio->name, "AMS DELTA keyboard adapter", sizeof(serio->name)); 163 163 + strscpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); 164 164 serio->dev.parent = &pdev->dev; 165 165 serio->port_data = priv; 166 166

+1 -1

drivers/input/serio/apbps2.c

reviewed

··· 176 176 priv->io->close = apbps2_close; 177 177 priv->io->write = apbps2_write; 178 178 priv->io->port_data = priv; 179 179 - strlcpy(priv->io->name, "APBPS2 PS/2", sizeof(priv->io->name)); 179 179 + strscpy(priv->io->name, "APBPS2 PS/2", sizeof(priv->io->name)); 180 180 snprintf(priv->io->phys, sizeof(priv->io->phys), 181 181 "apbps2_%d", apbps2_idx++); 182 182

+1 -1

drivers/input/serio/ct82c710.c

reviewed

··· 170 170 ct82c710_port->open = ct82c710_open; 171 171 ct82c710_port->close = ct82c710_close; 172 172 ct82c710_port->write = ct82c710_write; 173 173 - strlcpy(ct82c710_port->name, "C&T 82c710 mouse port", 173 173 + strscpy(ct82c710_port->name, "C&T 82c710 mouse port", 174 174 sizeof(ct82c710_port->name)); 175 175 snprintf(ct82c710_port->phys, sizeof(ct82c710_port->phys), 176 176 "isa%16llx/serio0", (unsigned long long)CT82C710_DATA);

+1 -1

drivers/input/serio/gscps2.c

reviewed

··· 361 361 362 362 snprintf(serio->name, sizeof(serio->name), "gsc-ps2-%s", 363 363 (ps2port->id == GSC_ID_KEYBOARD) ? "keyboard" : "mouse"); 364 364 - strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 364 364 + strscpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 365 365 serio->id.type = SERIO_8042; 366 366 serio->write = gscps2_write; 367 367 serio->open = gscps2_open;

+2 -2

drivers/input/serio/hyperv-keyboard.c

reviewed

··· 334 334 hv_serio->dev.parent = &hv_dev->device; 335 335 hv_serio->id.type = SERIO_8042_XL; 336 336 hv_serio->port_data = kbd_dev; 337 337 - strlcpy(hv_serio->name, dev_name(&hv_dev->device), 337 337 + strscpy(hv_serio->name, dev_name(&hv_dev->device), 338 338 sizeof(hv_serio->name)); 339 339 - strlcpy(hv_serio->phys, dev_name(&hv_dev->device), 339 339 + strscpy(hv_serio->phys, dev_name(&hv_dev->device), 340 340 sizeof(hv_serio->phys)); 341 341 342 342 hv_serio->start = hv_kbd_start;

+3 -3

drivers/input/serio/i8042-x86ia64io.h

reviewed

··· 1300 1300 1301 1301 static void i8042_pnp_id_to_string(struct pnp_id *id, char *dst, int dst_size) 1302 1302 { 1303 1303 - strlcpy(dst, "PNP:", dst_size); 1303 1303 + strscpy(dst, "PNP:", dst_size); 1304 1304 1305 1305 while (id) { 1306 1306 strlcat(dst, " ", dst_size); ··· 1320 1320 if (pnp_irq_valid(dev,0)) 1321 1321 i8042_pnp_kbd_irq = pnp_irq(dev, 0); 1322 1322 1323 1323 - strlcpy(i8042_pnp_kbd_name, did->id, sizeof(i8042_pnp_kbd_name)); 1323 1323 + strscpy(i8042_pnp_kbd_name, did->id, sizeof(i8042_pnp_kbd_name)); 1324 1324 if (strlen(pnp_dev_name(dev))) { 1325 1325 strlcat(i8042_pnp_kbd_name, ":", sizeof(i8042_pnp_kbd_name)); 1326 1326 strlcat(i8042_pnp_kbd_name, pnp_dev_name(dev), sizeof(i8042_pnp_kbd_name)); ··· 1347 1347 if (pnp_irq_valid(dev, 0)) 1348 1348 i8042_pnp_aux_irq = pnp_irq(dev, 0); 1349 1349 1350 1350 - strlcpy(i8042_pnp_aux_name, did->id, sizeof(i8042_pnp_aux_name)); 1350 1350 + strscpy(i8042_pnp_aux_name, did->id, sizeof(i8042_pnp_aux_name)); 1351 1351 if (strlen(pnp_dev_name(dev))) { 1352 1352 strlcat(i8042_pnp_aux_name, ":", sizeof(i8042_pnp_aux_name)); 1353 1353 strlcat(i8042_pnp_aux_name, pnp_dev_name(dev), sizeof(i8042_pnp_aux_name));

+7 -7

drivers/input/serio/i8042.c

reviewed

··· 1341 1341 serio->ps2_cmd_mutex = &i8042_mutex; 1342 1342 serio->port_data = port; 1343 1343 serio->dev.parent = &i8042_platform_device->dev; 1344 1344 - strlcpy(serio->name, "i8042 KBD port", sizeof(serio->name)); 1345 1345 - strlcpy(serio->phys, I8042_KBD_PHYS_DESC, sizeof(serio->phys)); 1346 1346 - strlcpy(serio->firmware_id, i8042_kbd_firmware_id, 1344 1344 + strscpy(serio->name, "i8042 KBD port", sizeof(serio->name)); 1345 1345 + strscpy(serio->phys, I8042_KBD_PHYS_DESC, sizeof(serio->phys)); 1346 1346 + strscpy(serio->firmware_id, i8042_kbd_firmware_id, 1347 1347 sizeof(serio->firmware_id)); 1348 1348 set_primary_fwnode(&serio->dev, i8042_kbd_fwnode); 1349 1349 ··· 1371 1371 serio->port_data = port; 1372 1372 serio->dev.parent = &i8042_platform_device->dev; 1373 1373 if (idx < 0) { 1374 1374 - strlcpy(serio->name, "i8042 AUX port", sizeof(serio->name)); 1375 1375 - strlcpy(serio->phys, I8042_AUX_PHYS_DESC, sizeof(serio->phys)); 1376 1376 - strlcpy(serio->firmware_id, i8042_aux_firmware_id, 1374 1374 + strscpy(serio->name, "i8042 AUX port", sizeof(serio->name)); 1375 1375 + strscpy(serio->phys, I8042_AUX_PHYS_DESC, sizeof(serio->phys)); 1376 1376 + strscpy(serio->firmware_id, i8042_aux_firmware_id, 1377 1377 sizeof(serio->firmware_id)); 1378 1378 serio->close = i8042_port_close; 1379 1379 } else { 1380 1380 snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx); 1381 1381 snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1); 1382 1382 - strlcpy(serio->firmware_id, i8042_aux_firmware_id, 1382 1382 + strscpy(serio->firmware_id, i8042_aux_firmware_id, 1383 1383 sizeof(serio->firmware_id)); 1384 1384 } 1385 1385

+4 -4

drivers/input/serio/olpc_apsp.c

reviewed

··· 199 199 kb_serio->close = olpc_apsp_close; 200 200 kb_serio->port_data = priv; 201 201 kb_serio->dev.parent = &pdev->dev; 202 202 - strlcpy(kb_serio->name, "sp keyboard", sizeof(kb_serio->name)); 203 203 - strlcpy(kb_serio->phys, "sp/serio0", sizeof(kb_serio->phys)); 202 202 + strscpy(kb_serio->name, "sp keyboard", sizeof(kb_serio->name)); 203 203 + strscpy(kb_serio->phys, "sp/serio0", sizeof(kb_serio->phys)); 204 204 priv->kbio = kb_serio; 205 205 serio_register_port(kb_serio); 206 206 ··· 216 216 pad_serio->close = olpc_apsp_close; 217 217 pad_serio->port_data = priv; 218 218 pad_serio->dev.parent = &pdev->dev; 219 219 - strlcpy(pad_serio->name, "sp touchpad", sizeof(pad_serio->name)); 220 220 - strlcpy(pad_serio->phys, "sp/serio1", sizeof(pad_serio->phys)); 219 219 + strscpy(pad_serio->name, "sp touchpad", sizeof(pad_serio->name)); 220 220 + strscpy(pad_serio->phys, "sp/serio1", sizeof(pad_serio->phys)); 221 221 priv->padio = pad_serio; 222 222 serio_register_port(pad_serio); 223 223

+1 -1

drivers/input/serio/parkbd.c

reviewed

··· 169 169 if (serio) { 170 170 serio->id.type = parkbd_mode; 171 171 serio->write = parkbd_write; 172 172 - strlcpy(serio->name, "PARKBD AT/XT keyboard adapter", sizeof(serio->name)); 172 172 + strscpy(serio->name, "PARKBD AT/XT keyboard adapter", sizeof(serio->name)); 173 173 snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", parkbd_dev->port->name); 174 174 } 175 175

+2 -2

drivers/input/serio/pcips2.c

reviewed

··· 149 149 serio->write = pcips2_write; 150 150 serio->open = pcips2_open; 151 151 serio->close = pcips2_close; 152 152 - strlcpy(serio->name, pci_name(dev), sizeof(serio->name)); 153 153 - strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 152 152 + strscpy(serio->name, pci_name(dev), sizeof(serio->name)); 153 153 + strscpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 154 154 serio->port_data = ps2if; 155 155 serio->dev.parent = &dev->dev; 156 156 ps2if->io = serio;

+2 -2

drivers/input/serio/ps2-gpio.c

reviewed

··· 449 449 serio->write = drvdata->write_enable ? ps2_gpio_write : NULL; 450 450 serio->port_data = drvdata; 451 451 serio->dev.parent = dev; 452 452 - strlcpy(serio->name, dev_name(dev), sizeof(serio->name)); 453 453 - strlcpy(serio->phys, dev_name(dev), sizeof(serio->phys)); 452 452 + strscpy(serio->name, dev_name(dev), sizeof(serio->name)); 453 453 + strscpy(serio->phys, dev_name(dev), sizeof(serio->phys)); 454 454 455 455 drvdata->serio = serio; 456 456 drvdata->dev = dev;

+1 -1

drivers/input/serio/ps2mult.c

reviewed

··· 131 131 if (!serio) 132 132 return -ENOMEM; 133 133 134 134 - strlcpy(serio->name, "TQC PS/2 Multiplexer", sizeof(serio->name)); 134 134 + strscpy(serio->name, "TQC PS/2 Multiplexer", sizeof(serio->name)); 135 135 snprintf(serio->phys, sizeof(serio->phys), 136 136 "%s/port%d", mx_serio->phys, i); 137 137 serio->id.type = SERIO_8042;

+2 -2

drivers/input/serio/q40kbd.c

reviewed

··· 126 126 port->close = q40kbd_close; 127 127 port->port_data = q40kbd; 128 128 port->dev.parent = &pdev->dev; 129 129 - strlcpy(port->name, "Q40 Kbd Port", sizeof(port->name)); 130 130 - strlcpy(port->phys, "Q40", sizeof(port->phys)); 129 129 + strscpy(port->name, "Q40 Kbd Port", sizeof(port->name)); 130 130 + strscpy(port->phys, "Q40", sizeof(port->phys)); 131 131 132 132 q40kbd_stop(); 133 133

+2 -2

drivers/input/serio/rpckbd.c

reviewed

··· 128 128 serio->close = rpckbd_close; 129 129 serio->dev.parent = &dev->dev; 130 130 serio->port_data = rpckbd; 131 131 - strlcpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name)); 132 132 - strlcpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys)); 131 131 + strscpy(serio->name, "RiscPC PS/2 kbd port", sizeof(serio->name)); 132 132 + strscpy(serio->phys, "rpckbd/serio0", sizeof(serio->phys)); 133 133 134 134 platform_set_drvdata(dev, serio); 135 135 serio_register_port(serio);

+2 -2

drivers/input/serio/sa1111ps2.c

reviewed

··· 267 267 serio->write = ps2_write; 268 268 serio->open = ps2_open; 269 269 serio->close = ps2_close; 270 270 - strlcpy(serio->name, dev_name(&dev->dev), sizeof(serio->name)); 271 271 - strlcpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 270 270 + strscpy(serio->name, dev_name(&dev->dev), sizeof(serio->name)); 271 271 + strscpy(serio->phys, dev_name(&dev->dev), sizeof(serio->phys)); 272 272 serio->port_data = ps2if; 273 273 serio->dev.parent = &dev->dev; 274 274 ps2if->io = serio;

+1 -1

drivers/input/serio/serport.c

reviewed

··· 171 171 if (!serio) 172 172 return -ENOMEM; 173 173 174 174 - strlcpy(serio->name, "Serial port", sizeof(serio->name)); 174 174 + strscpy(serio->name, "Serial port", sizeof(serio->name)); 175 175 snprintf(serio->phys, sizeof(serio->phys), "%s/serio0", tty_name(tty)); 176 176 serio->id = serport->id; 177 177 serio->id.type = SERIO_RS232;

+2 -2

drivers/input/serio/sun4i-ps2.c

reviewed

··· 256 256 serio->close = sun4i_ps2_close; 257 257 serio->port_data = drvdata; 258 258 serio->dev.parent = dev; 259 259 - strlcpy(serio->name, dev_name(dev), sizeof(serio->name)); 260 260 - strlcpy(serio->phys, dev_name(dev), sizeof(serio->phys)); 259 259 + strscpy(serio->name, dev_name(dev), sizeof(serio->name)); 260 260 + strscpy(serio->phys, dev_name(dev), sizeof(serio->phys)); 261 261 262 262 /* shutoff interrupt */ 263 263 writel(0, drvdata->reg_base + PS2_REG_GCTL);

+1 -1

drivers/input/tablet/acecad.c

reviewed

··· 155 155 acecad->input = input_dev; 156 156 157 157 if (dev->manufacturer) 158 158 - strlcpy(acecad->name, dev->manufacturer, sizeof(acecad->name)); 158 158 + strscpy(acecad->name, dev->manufacturer, sizeof(acecad->name)); 159 159 160 160 if (dev->product) { 161 161 if (dev->manufacturer)

+1 -1

drivers/input/tablet/hanwang.c

reviewed

··· 356 356 usb_make_path(dev, hanwang->phys, sizeof(hanwang->phys)); 357 357 strlcat(hanwang->phys, "/input0", sizeof(hanwang->phys)); 358 358 359 359 - strlcpy(hanwang->name, hanwang->features->name, sizeof(hanwang->name)); 359 359 + strscpy(hanwang->name, hanwang->features->name, sizeof(hanwang->name)); 360 360 input_dev->name = hanwang->name; 361 361 input_dev->phys = hanwang->phys; 362 362 usb_to_input_id(dev, &input_dev->id);

+1 -1

drivers/input/tablet/pegasus_notetaker.c

reviewed

··· 319 319 pegasus->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 320 320 321 321 if (dev->manufacturer) 322 322 - strlcpy(pegasus->name, dev->manufacturer, 322 322 + strscpy(pegasus->name, dev->manufacturer, 323 323 sizeof(pegasus->name)); 324 324 325 325 if (dev->product) {

+4 -4

drivers/input/touchscreen/atmel_mxt_ts.c

reviewed

··· 2497 2497 { 2498 2498 struct mxt_data *data = video_drvdata(file); 2499 2499 2500 2500 - strlcpy(cap->driver, "atmel_mxt_ts", sizeof(cap->driver)); 2501 2501 - strlcpy(cap->card, "atmel_mxt_ts touch", sizeof(cap->card)); 2500 2500 + strscpy(cap->driver, "atmel_mxt_ts", sizeof(cap->driver)); 2501 2501 + strscpy(cap->card, "atmel_mxt_ts touch", sizeof(cap->card)); 2502 2502 snprintf(cap->bus_info, sizeof(cap->bus_info), 2503 2503 "I2C:%s", dev_name(&data->client->dev)); 2504 2504 return 0; ··· 2514 2514 2515 2515 switch (i->index) { 2516 2516 case MXT_V4L_INPUT_REFS: 2517 2517 - strlcpy(i->name, "Mutual Capacitance References", 2517 2517 + strscpy(i->name, "Mutual Capacitance References", 2518 2518 sizeof(i->name)); 2519 2519 break; 2520 2520 case MXT_V4L_INPUT_DELTAS: 2521 2521 - strlcpy(i->name, "Mutual Capacitance Deltas", sizeof(i->name)); 2521 2521 + strscpy(i->name, "Mutual Capacitance Deltas", sizeof(i->name)); 2522 2522 break; 2523 2523 } 2524 2524

+6 -6

drivers/input/touchscreen/edt-ft5x06.c

reviewed

··· 912 912 p = strchr(rdbuf, '*'); 913 913 if (p) 914 914 *p++ = '\0'; 915 915 - strlcpy(model_name, rdbuf + 1, EDT_NAME_LEN); 916 916 - strlcpy(fw_version, p ? p : "", EDT_NAME_LEN); 915 915 + strscpy(model_name, rdbuf + 1, EDT_NAME_LEN); 916 916 + strscpy(fw_version, p ? p : "", EDT_NAME_LEN); 917 917 } else if (!strncasecmp(rdbuf, "EP0", 3)) { 918 918 tsdata->version = EDT_M12; 919 919 ··· 926 926 p = strchr(rdbuf, '*'); 927 927 if (p) 928 928 *p++ = '\0'; 929 929 - strlcpy(model_name, rdbuf, EDT_NAME_LEN); 930 930 - strlcpy(fw_version, p ? p : "", EDT_NAME_LEN); 929 929 + strscpy(model_name, rdbuf, EDT_NAME_LEN); 930 930 + strscpy(fw_version, p ? p : "", EDT_NAME_LEN); 931 931 } else { 932 932 /* If it is not an EDT M06/M12 touchscreen, then the model 933 933 * detection is a bit hairy. The different ft5x06 ··· 945 945 if (error) 946 946 return error; 947 947 948 948 - strlcpy(fw_version, rdbuf, 2); 948 948 + strscpy(fw_version, rdbuf, 2); 949 949 950 950 error = edt_ft5x06_ts_readwrite(client, 1, "\xA8", 951 951 1, rdbuf); ··· 981 981 1, rdbuf); 982 982 if (error) 983 983 return error; 984 984 - strlcpy(fw_version, rdbuf, 1); 984 984 + strscpy(fw_version, rdbuf, 1); 985 985 snprintf(model_name, EDT_NAME_LEN, 986 986 "EVERVISION-FT5726NEi"); 987 987 break;

+3 -3

drivers/input/touchscreen/sur40.c

reviewed

··· 939 939 { 940 940 struct sur40_state *sur40 = video_drvdata(file); 941 941 942 942 - strlcpy(cap->driver, DRIVER_SHORT, sizeof(cap->driver)); 943 943 - strlcpy(cap->card, DRIVER_LONG, sizeof(cap->card)); 942 942 + strscpy(cap->driver, DRIVER_SHORT, sizeof(cap->driver)); 943 943 + strscpy(cap->card, DRIVER_LONG, sizeof(cap->card)); 944 944 usb_make_path(sur40->usbdev, cap->bus_info, sizeof(cap->bus_info)); 945 945 return 0; 946 946 } ··· 952 952 return -EINVAL; 953 953 i->type = V4L2_INPUT_TYPE_TOUCH; 954 954 i->std = V4L2_STD_UNKNOWN; 955 955 - strlcpy(i->name, "In-Cell Sensor", sizeof(i->name)); 955 955 + strscpy(i->name, "In-Cell Sensor", sizeof(i->name)); 956 956 i->capabilities = 0; 957 957 return 0; 958 958 }

+1 -1

drivers/input/touchscreen/usbtouchscreen.c

reviewed

··· 1708 1708 usbtouch->input = input_dev; 1709 1709 1710 1710 if (udev->manufacturer) 1711 1711 - strlcpy(usbtouch->name, udev->manufacturer, sizeof(usbtouch->name)); 1711 1711 + strscpy(usbtouch->name, udev->manufacturer, sizeof(usbtouch->name)); 1712 1712 1713 1713 if (udev->product) { 1714 1714 if (udev->manufacturer)

+3 -3

drivers/input/touchscreen/wacom_w8001.c

reviewed

··· 625 625 /* For backwards-compatibility we compose the basename based on 626 626 * capabilities and then just append the tool type 627 627 */ 628 628 - strlcpy(basename, "Wacom Serial", sizeof(basename)); 628 628 + strscpy(basename, "Wacom Serial", sizeof(basename)); 629 629 630 630 err_pen = w8001_setup_pen(w8001, basename, sizeof(basename)); 631 631 err_touch = w8001_setup_touch(w8001, basename, sizeof(basename)); ··· 635 635 } 636 636 637 637 if (!err_pen) { 638 638 - strlcpy(w8001->pen_name, basename, sizeof(w8001->pen_name)); 638 638 + strscpy(w8001->pen_name, basename, sizeof(w8001->pen_name)); 639 639 strlcat(w8001->pen_name, " Pen", sizeof(w8001->pen_name)); 640 640 input_dev_pen->name = w8001->pen_name; 641 641 ··· 651 651 } 652 652 653 653 if (!err_touch) { 654 654 - strlcpy(w8001->touch_name, basename, sizeof(w8001->touch_name)); 654 654 + strscpy(w8001->touch_name, basename, sizeof(w8001->touch_name)); 655 655 strlcat(w8001->touch_name, " Finger", 656 656 sizeof(w8001->touch_name)); 657 657 input_dev_touch->name = w8001->touch_name;