Remove all strlcpy in favor of strscpy
Subsystems (411)
cover Remove all strlcpy in favor of strscpy
strlcpy() copy a C-String into a sized buffer, the result is always a valid NULL-terminated that fits in the buffer, howerver it has severals issues. It reads the source buffer first, which is dangerous if it is non NULL-terminated or if the corresponding buffer is unbounded. Its safe replacement is strscpy(), as suggested in the deprecated interface [1].
This series replaces all occurences of strlcpy in two steps, firsly all cases of strlcpy's return value are manually replaced by the corresponding calls of strscpy() with the new handling of the return value (as the return code is different in case of error). Then all other cases are automatically replaced by using coccinelle.
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
Romain Perier (2):
Manual replacement of the deprecated strlcpy() with return values Automated replacement of all other deprecated strlcpy()
arch/alpha/kernel/setup.c | 5 +- arch/arm/kernel/atags_parse.c | 4 +- arch/arm/kernel/setup.c | 2 +- arch/arm/kernel/vdso.c | 2 +- arch/arm/mach-s3c/mach-mini2440.c | 2 +- arch/arm/mach-s3c/mach-mini6410.c | 2 +- arch/arm/mach-s3c/mach-real6410.c | 2 +- arch/hexagon/kernel/setup.c | 6 +- arch/ia64/kernel/setup.c | 2 +- arch/m68k/emu/natfeat.c | 6 +- arch/m68k/kernel/setup_mm.c | 2 +- arch/microblaze/kernel/prom.c | 2 +- arch/mips/bcm47xx/board.c | 2 +- arch/mips/kernel/prom.c | 6 +- arch/mips/kernel/relocate.c | 2 +- arch/mips/kernel/setup.c | 6 +- arch/mips/pic32/pic32mzda/init.c | 2 +- arch/nios2/kernel/cpuinfo.c | 2 +- arch/nios2/kernel/setup.c | 6 +- arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/setup.c | 2 +- arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- arch/powerpc/kernel/vdso.c | 4 +- arch/powerpc/platforms/pasemi/misc.c | 3 +- arch/powerpc/platforms/powermac/bootx_init.c | 2 +- arch/powerpc/platforms/powernv/idle.c | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/hvcserver.c | 2 +- arch/riscv/kernel/setup.c | 2 +- arch/s390/kernel/debug.c | 2 +- arch/s390/kernel/early.c | 2 +- arch/sh/drivers/dma/dma-api.c | 2 +- arch/sh/kernel/setup.c | 4 +- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/kernel/setup_32.c | 2 +- arch/sparc/kernel/setup_64.c | 2 +- arch/sparc/prom/bootstr_32.c | 3 +- arch/um/drivers/net_kern.c | 2 +- arch/um/drivers/vector_kern.c | 2 +- arch/um/kernel/um_arch.c | 2 +- arch/um/os-Linux/drivers/tuntap_user.c | 2 +- arch/um/os-Linux/umid.c | 6 +- arch/x86/kernel/setup.c | 6 +- arch/xtensa/kernel/setup.c | 8 +-- arch/xtensa/platforms/iss/network.c | 4 +- block/elevator.c | 2 +- block/genhd.c | 2 +- crypto/api.c | 2 +- crypto/essiv.c | 2 +- crypto/lrw.c | 6 +- crypto/xts.c | 6 +- drivers/acpi/bus.c | 4 +- drivers/acpi/processor_idle.c | 8 +-- drivers/acpi/utils.c | 6 +- drivers/base/dd.c | 2 +- drivers/block/drbd/drbd_nl.c | 3 +- drivers/block/mtip32xx/mtip32xx.c | 20 +++--- drivers/block/ps3vram.c | 2 +- drivers/block/rnbd/rnbd-clt-sysfs.c | 6 +- drivers/block/rnbd/rnbd-clt.c | 6 +- drivers/block/rnbd/rnbd-srv.c | 6 +- drivers/block/zram/zram_drv.c | 7 +- drivers/char/ipmi/ipmi_ssif.c | 2 +- drivers/char/tpm/tpm_ppi.c | 2 +- drivers/clk/clkdev.c | 2 +- drivers/clk/mvebu/dove-divider.c | 2 +- drivers/clk/tegra/clk-bpmp.c | 2 +- drivers/cpuidle/cpuidle-powernv.c | 4 +- .../crypto/marvell/octeontx/otx_cptpf_ucode.c | 6 +- drivers/crypto/qat/qat_common/adf_cfg.c | 6 +- drivers/crypto/qat/qat_common/adf_ctl_drv.c | 3 +- .../qat/qat_common/adf_transport_debug.c | 2 +- drivers/dma-buf/dma-buf.c | 4 +- drivers/dma-buf/sw_sync.c | 2 +- drivers/dma-buf/sync_file.c | 8 +-- drivers/dma/dmatest.c | 12 ++-- drivers/dma/xilinx/xilinx_dpdma.c | 2 +- drivers/eisa/eisa-bus.c | 3 +- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/reset.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 3 +- drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2 +- .../drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 6 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/drm_dp_helper.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- drivers/gpu/drm/drm_mipi_dsi.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 2 +- drivers/gpu/drm/msm/dp/dp_parser.c | 9 ++- drivers/gpu/drm/radeon/radeon_atombios.c | 4 +- drivers/gpu/drm/radeon/radeon_combios.c | 4 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 2 +- drivers/hid/hid-steam.c | 12 ++-- drivers/hid/i2c-hid/i2c-hid-core.c | 2 +- drivers/hid/usbhid/hid-core.c | 2 +- drivers/hid/usbhid/usbkbd.c | 2 +- drivers/hid/usbhid/usbmouse.c | 2 +- drivers/hid/wacom_sys.c | 6 +- drivers/hwmon/adc128d818.c | 2 +- drivers/hwmon/adm1021.c | 2 +- drivers/hwmon/adm1025.c | 2 +- drivers/hwmon/adm1026.c | 2 +- drivers/hwmon/adm1029.c | 2 +- drivers/hwmon/adm1031.c | 2 +- drivers/hwmon/adm9240.c | 2 +- drivers/hwmon/adt7411.c | 2 +- drivers/hwmon/adt7462.c | 2 +- drivers/hwmon/adt7470.c | 2 +- drivers/hwmon/adt7475.c | 2 +- drivers/hwmon/amc6821.c | 2 +- drivers/hwmon/asb100.c | 2 +- drivers/hwmon/asc7621.c | 2 +- drivers/hwmon/dell-smm-hwmon.c | 6 +- drivers/hwmon/dme1737.c | 2 +- drivers/hwmon/emc1403.c | 12 ++-- drivers/hwmon/emc2103.c | 2 +- drivers/hwmon/emc6w201.c | 2 +- drivers/hwmon/f75375s.c | 2 +- drivers/hwmon/fschmd.c | 2 +- drivers/hwmon/ftsteutates.c | 2 +- drivers/hwmon/gl518sm.c | 2 +- drivers/hwmon/gl520sm.c | 2 +- drivers/hwmon/jc42.c | 2 +- drivers/hwmon/lm63.c | 6 +- drivers/hwmon/lm73.c | 2 +- drivers/hwmon/lm75.c | 2 +- drivers/hwmon/lm77.c | 2 +- drivers/hwmon/lm78.c | 2 +- drivers/hwmon/lm80.c | 2 +- drivers/hwmon/lm83.c | 2 +- drivers/hwmon/lm85.c | 2 +- drivers/hwmon/lm87.c | 2 +- drivers/hwmon/lm90.c | 2 +- drivers/hwmon/lm92.c | 2 +- drivers/hwmon/lm93.c | 2 +- drivers/hwmon/lm95234.c | 2 +- drivers/hwmon/lm95241.c | 2 +- drivers/hwmon/lm95245.c | 2 +- drivers/hwmon/max1619.c | 2 +- drivers/hwmon/max1668.c | 2 +- drivers/hwmon/max31730.c | 2 +- drivers/hwmon/max6639.c | 2 +- drivers/hwmon/max6642.c | 2 +- drivers/hwmon/nct7802.c | 2 +- drivers/hwmon/nct7904.c | 2 +- drivers/hwmon/pmbus/max20730.c | 66 ++++++++++--------- drivers/hwmon/sch56xx-common.c | 2 +- drivers/hwmon/smsc47m192.c | 2 +- drivers/hwmon/stts751.c | 2 +- drivers/hwmon/thmc50.c | 2 +- drivers/hwmon/tmp401.c | 2 +- drivers/hwmon/tmp421.c | 2 +- drivers/hwmon/w83781d.c | 2 +- drivers/hwmon/w83791d.c | 2 +- drivers/hwmon/w83792d.c | 2 +- drivers/hwmon/w83793.c | 2 +- drivers/hwmon/w83795.c | 2 +- drivers/hwmon/w83l785ts.c | 2 +- drivers/hwmon/w83l786ng.c | 2 +- drivers/i2c/busses/i2c-altera.c | 2 +- drivers/i2c/busses/i2c-aspeed.c | 2 +- drivers/i2c/busses/i2c-au1550.c | 2 +- drivers/i2c/busses/i2c-axxia.c | 2 +- drivers/i2c/busses/i2c-bcm-kona.c | 2 +- drivers/i2c/busses/i2c-brcmstb.c | 2 +- drivers/i2c/busses/i2c-cbus-gpio.c | 2 +- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +- drivers/i2c/busses/i2c-davinci.c | 2 +- drivers/i2c/busses/i2c-digicolor.c | 2 +- drivers/i2c/busses/i2c-efm32.c | 2 +- drivers/i2c/busses/i2c-eg20t.c | 3 +- drivers/i2c/busses/i2c-emev2.c | 2 +- drivers/i2c/busses/i2c-exynos5.c | 2 +- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 2 +- drivers/i2c/busses/i2c-hix5hd2.c | 2 +- drivers/i2c/busses/i2c-i801.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 2 +- drivers/i2c/busses/i2c-icy.c | 2 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- drivers/i2c/busses/i2c-imx.c | 3 +- drivers/i2c/busses/i2c-lpc2k.c | 2 +- drivers/i2c/busses/i2c-meson.c | 3 +- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-mt7621.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- drivers/i2c/busses/i2c-mxs.c | 2 +- drivers/i2c/busses/i2c-nvidia-gpu.c | 4 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/i2c/busses/i2c-opal.c | 4 +- drivers/i2c/busses/i2c-parport.c | 2 +- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-qcom-geni.c | 2 +- drivers/i2c/busses/i2c-qup.c | 2 +- drivers/i2c/busses/i2c-rcar.c | 2 +- drivers/i2c/busses/i2c-riic.c | 2 +- drivers/i2c/busses/i2c-rk3x.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 2 +- drivers/i2c/busses/i2c-sh_mobile.c | 2 +- drivers/i2c/busses/i2c-simtec.c | 2 +- drivers/i2c/busses/i2c-sirf.c | 2 +- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/i2c/busses/i2c-sun6i-p2wi.c | 2 +- drivers/i2c/busses/i2c-taos-evm.c | 2 +- drivers/i2c/busses/i2c-tegra-bpmp.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 2 +- drivers/i2c/busses/i2c-uniphier-f.c | 2 +- drivers/i2c/busses/i2c-uniphier.c | 2 +- drivers/i2c/busses/i2c-versatile.c | 3 +- drivers/i2c/busses/i2c-wmt.c | 2 +- drivers/i2c/busses/i2c-zx2967.c | 3 +- drivers/i2c/i2c-core-base.c | 2 +- drivers/i2c/i2c-smbus.c | 2 +- drivers/idle/intel_idle.c | 2 +- .../iio/common/st_sensors/st_sensors_core.c | 2 +- drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 4 +- drivers/infiniband/core/cma_configfs.c | 2 +- drivers/infiniband/core/device.c | 4 +- drivers/infiniband/hw/bnxt_re/main.c | 2 +- drivers/infiniband/hw/efa/efa_main.c | 4 +- drivers/infiniband/hw/hfi1/file_ops.c | 2 +- drivers/infiniband/hw/hfi1/verbs.c | 2 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 3 +- drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 +- .../ulp/opa_vnic/opa_vnic_ethtool.c | 5 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 6 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- drivers/input/keyboard/lkkbd.c | 8 +-- drivers/input/misc/keyspan_remote.c | 3 +- drivers/input/mouse/hgpk.c | 2 +- drivers/input/mouse/synaptics.c | 4 +- drivers/input/mouse/synaptics_usb.c | 2 +- drivers/input/mouse/vsxxxaa.c | 4 +- drivers/input/rmi4/rmi_f03.c | 2 +- drivers/input/rmi4/rmi_f54.c | 8 +-- drivers/input/serio/altera_ps2.c | 4 +- drivers/input/serio/ambakmi.c | 4 +- drivers/input/serio/ams_delta_serio.c | 5 +- drivers/input/serio/apbps2.c | 2 +- drivers/input/serio/ct82c710.c | 2 +- drivers/input/serio/gscps2.c | 2 +- drivers/input/serio/hyperv-keyboard.c | 4 +- drivers/input/serio/i8042-x86ia64io.h | 6 +- drivers/input/serio/i8042.c | 14 ++-- drivers/input/serio/olpc_apsp.c | 8 +-- drivers/input/serio/parkbd.c | 3 +- drivers/input/serio/pcips2.c | 4 +- drivers/input/serio/ps2-gpio.c | 4 +- drivers/input/serio/ps2mult.c | 2 +- drivers/input/serio/q40kbd.c | 4 +- drivers/input/serio/rpckbd.c | 4 +- drivers/input/serio/sa1111ps2.c | 4 +- drivers/input/serio/serport.c | 2 +- drivers/input/serio/sun4i-ps2.c | 4 +- drivers/input/tablet/acecad.c | 2 +- drivers/input/tablet/hanwang.c | 2 +- drivers/input/tablet/pegasus_notetaker.c | 2 +- drivers/input/touchscreen/atmel_mxt_ts.c | 8 +-- drivers/input/touchscreen/edt-ft5x06.c | 12 ++-- drivers/input/touchscreen/exc3000.c | 4 +- drivers/input/touchscreen/sur40.c | 6 +- drivers/input/touchscreen/usbtouchscreen.c | 3 +- drivers/input/touchscreen/wacom_w8001.c | 7 +- drivers/isdn/capi/kcapi.c | 4 +- drivers/leds/led-class.c | 2 +- drivers/leds/leds-aat1290.c | 2 +- drivers/leds/leds-as3645a.c | 4 +- drivers/leds/leds-blinkm.c | 2 +- drivers/leds/leds-spi-byte.c | 2 +- drivers/lightnvm/core.c | 6 +- drivers/macintosh/therm_windtunnel.c | 4 +- drivers/md/dm-ioctl.c | 4 +- drivers/md/md-bitmap.c | 6 +- drivers/md/md-cluster.c | 2 +- drivers/md/md.c | 6 +- drivers/message/fusion/mptbase.c | 6 +- drivers/message/fusion/mptctl.c | 5 +- drivers/mfd/htc-i2cpld.c | 2 +- drivers/mfd/lpc_ich.c | 2 +- drivers/mfd/mfd-core.c | 2 +- drivers/misc/altera-stapl/altera.c | 15 ++--- drivers/misc/eeprom/eeprom.c | 2 +- drivers/misc/eeprom/idt_89hpesx.c | 2 +- drivers/misc/habanalabs/common/device.c | 2 +- drivers/misc/ics932s401.c | 2 +- drivers/misc/mei/bus-fixup.c | 2 +- drivers/most/configfs.c | 8 +-- drivers/mtd/devices/block2mtd.c | 2 +- drivers/mtd/parsers/cmdlinepart.c | 4 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/can/sja1000/peak_pcmcia.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/dsa/b53/b53_common.c | 4 +- drivers/net/dsa/bcm_sf2_cfp.c | 4 +- drivers/net/dsa/mv88e6xxx/chip.c | 5 +- drivers/net/dsa/sja1105/sja1105_ethtool.c | 4 +- drivers/net/dummy.c | 2 +- drivers/net/ethernet/3com/3c509.c | 2 +- drivers/net/ethernet/3com/3c515.c | 2 +- drivers/net/ethernet/3com/3c589_cs.c | 2 +- drivers/net/ethernet/3com/3c59x.c | 6 +- drivers/net/ethernet/3com/typhoon.c | 8 +-- drivers/net/ethernet/8390/ax88796.c | 6 +- drivers/net/ethernet/8390/etherh.c | 6 +- drivers/net/ethernet/adaptec/starfire.c | 4 +- drivers/net/ethernet/aeroflex/greth.c | 4 +- drivers/net/ethernet/agere/et131x.c | 4 +- drivers/net/ethernet/alacritech/slicoss.c | 4 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- drivers/net/ethernet/alteon/acenic.c | 6 +- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/amd/amd8111e.c | 4 +- drivers/net/ethernet/amd/au1000_eth.c | 2 +- drivers/net/ethernet/amd/nmclan_cs.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 6 +- drivers/net/ethernet/amd/sunlance.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +- .../ethernet/aquantia/atlantic/aq_ethtool.c | 2 +- drivers/net/ethernet/arc/emac_main.c | 2 +- drivers/net/ethernet/atheros/ag71xx.c | 4 +- .../ethernet/atheros/atl1c/atl1c_ethtool.c | 4 +- .../ethernet/atheros/atl1e/atl1e_ethtool.c | 6 +- drivers/net/ethernet/atheros/atlx/atl1.c | 4 +- drivers/net/ethernet/atheros/atlx/atl2.c | 6 +- drivers/net/ethernet/broadcom/b44.c | 7 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +- drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- drivers/net/ethernet/broadcom/bgmac.c | 8 +-- drivers/net/ethernet/broadcom/bnx2.c | 6 +- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- .../ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 ++-- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 6 +- .../net/ethernet/brocade/bna/bnad_ethtool.c | 6 +- .../net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- .../ethernet/cavium/thunder/nicvf_ethtool.c | 4 +- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 4 +- .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +- .../ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 4 +- .../chelsio/inline_crypto/chtls/chtls_main.c | 2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- .../net/ethernet/cisco/enic/enic_ethtool.c | 6 +- drivers/net/ethernet/davicom/dm9000.c | 4 +- drivers/net/ethernet/dec/tulip/de2104x.c | 4 +- drivers/net/ethernet/dec/tulip/dmfe.c | 4 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- drivers/net/ethernet/dlink/dl2k.c | 4 +- drivers/net/ethernet/dlink/sundance.c | 4 +- drivers/net/ethernet/dnet.c | 4 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 16 +++-- .../net/ethernet/emulex/benet/be_ethtool.c | 6 +- drivers/net/ethernet/faraday/ftgmac100.c | 5 +- drivers/net/ethernet/faraday/ftmac100.c | 5 +- drivers/net/ethernet/fealnx.c | 4 +- .../ethernet/freescale/dpaa/dpaa_ethtool.c | 5 +- .../ethernet/freescale/dpaa2/dpaa2-ethtool.c | 8 +-- .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- .../ethernet/freescale/enetc/enetc_ethtool.c | 4 +- drivers/net/ethernet/freescale/fec_main.c | 9 +-- drivers/net/ethernet/freescale/fec_ptp.c | 2 +- .../ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- .../net/ethernet/freescale/gianfar_ethtool.c | 2 +- .../net/ethernet/freescale/ucc_geth_ethtool.c | 4 +- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- drivers/net/ethernet/google/gve/gve_ethtool.c | 6 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +- .../net/ethernet/huawei/hinic/hinic_ethtool.c | 4 +- drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 4 +- drivers/net/ethernet/ibm/emac/core.c | 4 +- drivers/net/ethernet/ibm/ibmveth.c | 4 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 +- drivers/net/ethernet/intel/e100.c | 5 +- .../net/ethernet/intel/e1000/e1000_ethtool.c | 5 +- drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +- drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- .../net/ethernet/intel/i40e/i40e_ethtool.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 16 ++--- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- .../net/ethernet/intel/iavf/iavf_ethtool.c | 6 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 +- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/intel/igbvf/ethtool.c | 4 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 +- .../net/ethernet/intel/ixgb/ixgb_ethtool.c | 5 +- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +- drivers/net/ethernet/jme.c | 6 +- drivers/net/ethernet/korina.c | 6 +- drivers/net/ethernet/lantiq_etop.c | 6 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 8 +-- drivers/net/ethernet/marvell/mvneta.c | 7 +- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 7 +- .../marvell/octeontx2/nic/otx2_ethtool.c | 8 +-- .../marvell/prestera/prestera_ethtool.c | 4 +- drivers/net/ethernet/marvell/pxa168_eth.c | 8 +-- drivers/net/ethernet/marvell/skge.c | 6 +- drivers/net/ethernet/marvell/sky2.c | 6 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 +- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- .../net/ethernet/mellanox/mlx4/en_ethtool.c | 7 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 3 +- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 6 +- .../mellanox/mlx5/core/ipoib/ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 +- .../mellanox/mlxsw/spectrum_ethtool.c | 6 +- .../net/ethernet/mellanox/mlxsw/switchx2.c | 7 +- drivers/net/ethernet/micrel/ks8851_common.c | 6 +- drivers/net/ethernet/micrel/ksz884x.c | 6 +- drivers/net/ethernet/microchip/enc28j60.c | 8 +-- drivers/net/ethernet/microchip/encx24j600.c | 6 +- .../net/ethernet/microchip/lan743x_ethtool.c | 6 +- .../net/ethernet/myricom/myri10ge/myri10ge.c | 8 +-- drivers/net/ethernet/natsemi/natsemi.c | 6 +- drivers/net/ethernet/natsemi/ns83820.c | 7 +- drivers/net/ethernet/neterion/s2io.c | 6 +- .../net/ethernet/neterion/vxge/vxge-ethtool.c | 8 +-- .../net/ethernet/neterion/vxge/vxge-main.c | 2 +- .../ethernet/netronome/nfp/nfp_net_ethtool.c | 6 +- drivers/net/ethernet/ni/nixge.c | 4 +- drivers/net/ethernet/nvidia/forcedeth.c | 6 +- drivers/net/ethernet/nxp/lpc_eth.c | 6 +- .../oki-semi/pch_gbe/pch_gbe_ethtool.c | 7 +- drivers/net/ethernet/packetengines/hamachi.c | 6 +- .../net/ethernet/packetengines/yellowfin.c | 6 +- .../ethernet/pensando/ionic/ionic_ethtool.c | 6 +- .../net/ethernet/pensando/ionic/ionic_lif.c | 2 +- .../qlogic/netxen/netxen_nic_ethtool.c | 6 +- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- .../net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/qlogic/qla3xxx.c | 6 +- .../ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 +- .../net/ethernet/qualcomm/emac/emac-ethtool.c | 2 +- drivers/net/ethernet/qualcomm/qca_debug.c | 8 +-- drivers/net/ethernet/rdc/r6040.c | 6 +- drivers/net/ethernet/realtek/8139cp.c | 6 +- drivers/net/ethernet/realtek/8139too.c | 6 +- drivers/net/ethernet/realtek/r8169_main.c | 8 +-- drivers/net/ethernet/rocker/rocker_main.c | 4 +- .../ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/efx_common.c | 2 +- drivers/net/ethernet/sfc/ethtool_common.c | 7 +- drivers/net/ethernet/sfc/falcon/efx.c | 4 +- drivers/net/ethernet/sfc/falcon/ethtool.c | 9 +-- drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- drivers/net/ethernet/sfc/falcon/nic.c | 2 +- drivers/net/ethernet/sfc/mcdi_mon.c | 2 +- drivers/net/ethernet/sfc/nic.c | 2 +- drivers/net/ethernet/sgi/ioc3-eth.c | 6 +- drivers/net/ethernet/sis/sis190.c | 7 +- drivers/net/ethernet/sis/sis900.c | 6 +- drivers/net/ethernet/smsc/epic100.c | 6 +- drivers/net/ethernet/smsc/smc911x.c | 6 +- drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- drivers/net/ethernet/smsc/smc91x.c | 6 +- drivers/net/ethernet/smsc/smsc911x.c | 6 +- drivers/net/ethernet/smsc/smsc9420.c | 6 +- drivers/net/ethernet/socionext/netsec.c | 4 +- drivers/net/ethernet/socionext/sni_ave.c | 4 +- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 9 +-- drivers/net/ethernet/sun/cassini.c | 6 +- drivers/net/ethernet/sun/ldmvsw.c | 4 +- drivers/net/ethernet/sun/niu.c | 8 +-- drivers/net/ethernet/sun/sunbmac.c | 4 +- drivers/net/ethernet/sun/sungem.c | 6 +- drivers/net/ethernet/sun/sunhme.c | 7 +- drivers/net/ethernet/sun/sunqe.c | 4 +- drivers/net/ethernet/sun/sunvnet.c | 4 +- .../net/ethernet/synopsys/dwc-xlgmac-common.c | 4 +- .../ethernet/synopsys/dwc-xlgmac-ethtool.c | 6 +- drivers/net/ethernet/tehuti/tehuti.c | 8 +-- drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +- drivers/net/ethernet/ti/cpmac.c | 4 +- drivers/net/ethernet/ti/cpsw.c | 6 +- drivers/net/ethernet/ti/cpsw_new.c | 6 +- drivers/net/ethernet/ti/davinci_emac.c | 4 +- drivers/net/ethernet/ti/tlan.c | 8 +-- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +- .../net/ethernet/toshiba/spider_net_ethtool.c | 8 +-- drivers/net/ethernet/toshiba/tc35815.c | 6 +- drivers/net/ethernet/via/via-rhine.c | 4 +- drivers/net/ethernet/via/via-velocity.c | 10 +-- drivers/net/ethernet/wiznet/w5100.c | 6 +- drivers/net/ethernet/wiznet/w5300.c | 6 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 4 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 +- drivers/net/fjes/fjes_ethtool.c | 6 +- drivers/net/geneve.c | 4 +- drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/ipvlan/ipvlan_main.c | 4 +- drivers/net/macvlan.c | 4 +- drivers/net/net_failover.c | 4 +- drivers/net/netconsole.c | 10 +-- drivers/net/ntb_netdev.c | 6 +- drivers/net/phy/adin.c | 4 +- drivers/net/phy/bcm-phy-lib.c | 4 +- drivers/net/phy/marvell.c | 2 +- drivers/net/phy/micrel.c | 4 +- drivers/net/phy/mscc/mscc_main.c | 4 +- drivers/net/phy/phy_device.c | 2 +- drivers/net/rionet.c | 8 +-- drivers/net/team/team.c | 4 +- drivers/net/tun.c | 8 +-- drivers/net/usb/aqc111.c | 2 +- drivers/net/usb/asix_common.c | 4 +- drivers/net/usb/catc.c | 4 +- drivers/net/usb/pegasus.c | 4 +- drivers/net/usb/r8152.c | 8 +-- drivers/net/usb/rtl8150.c | 4 +- drivers/net/usb/sierra_net.c | 4 +- drivers/net/usb/usbnet.c | 4 +- drivers/net/veth.c | 4 +- drivers/net/virtio_net.c | 6 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 6 +- drivers/net/vrf.c | 4 +- drivers/net/vxlan.c | 4 +- drivers/net/wimax/i2400m/netdev.c | 8 +-- drivers/net/wimax/i2400m/usb.c | 4 +- drivers/net/wireless/ath/ath10k/coredump.c | 6 +- drivers/net/wireless/ath/ath10k/qmi.c | 5 +- drivers/net/wireless/ath/ath11k/qmi.c | 6 +- drivers/net/wireless/ath/ath6kl/init.c | 4 +- drivers/net/wireless/ath/carl9170/fw.c | 2 +- drivers/net/wireless/ath/wil6210/main.c | 2 +- drivers/net/wireless/ath/wil6210/netdev.c | 2 +- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- drivers/net/wireless/atmel/atmel.c | 3 +- drivers/net/wireless/broadcom/b43/leds.c | 2 +- .../net/wireless/broadcom/b43legacy/leds.c | 2 +- .../broadcom/brcm80211/brcmfmac/common.c | 8 +-- .../broadcom/brcm80211/brcmfmac/core.c | 8 +-- .../broadcom/brcm80211/brcmfmac/firmware.c | 5 +- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 7 +- .../net/wireless/intel/iwlegacy/3945-mac.c | 2 +- .../wireless/intersil/hostap/hostap_ioctl.c | 2 +- .../wireless/intersil/prism54/islpci_dev.c | 4 +- .../net/wireless/marvell/libertas/ethtool.c | 4 +- drivers/net/wireless/marvell/mwifiex/main.c | 3 +- .../mediatek/mt76/mt7615/mt7615_trace.h | 2 +- .../wireless/mediatek/mt76/mt76x02_trace.h | 2 +- drivers/net/wireless/mediatek/mt76/trace.h | 2 +- .../net/wireless/mediatek/mt76/usb_trace.h | 2 +- drivers/net/wireless/mediatek/mt7601u/trace.h | 2 +- drivers/net/wireless/microchip/wilc1000/mon.c | 2 +- .../net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- .../net/wireless/quantenna/qtnfmac/commands.c | 2 +- .../wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- drivers/net/wireless/wl3501_cs.c | 8 +-- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/fabrics.c | 2 +- drivers/nvme/target/admin-cmd.c | 2 +- drivers/nvme/target/discovery.c | 2 +- drivers/of/base.c | 2 +- drivers/of/fdt.c | 6 +- drivers/of/unittest.c | 2 +- drivers/parisc/led.c | 2 +- drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- drivers/platform/x86/i2c-multi-instantiate.c | 2 +- .../platform/x86/intel_cht_int33fe_typec.c | 6 +- drivers/platform/x86/surface3_power.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 5 +- drivers/remoteproc/qcom_sysmon.c | 2 +- drivers/rpmsg/qcom_glink_ssr.c | 2 +- drivers/s390/block/dasd_devmap.c | 2 +- drivers/s390/block/dasd_eer.c | 4 +- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/char/diag_ftp.c | 4 +- drivers/s390/char/hmcdrv_cache.c | 2 +- drivers/s390/char/sclp_ftp.c | 6 +- drivers/s390/char/tape_class.c | 4 +- drivers/s390/cio/qdio_debug.c | 2 +- drivers/s390/net/ctcm_main.c | 2 +- drivers/s390/net/fsm.c | 2 +- drivers/s390/net/qeth_ethtool.c | 4 +- drivers/s390/scsi/zfcp_aux.c | 2 +- drivers/s390/scsi/zfcp_fc.c | 10 +-- drivers/scsi/3w-9xxx.c | 2 +- drivers/scsi/aacraid/aachba.c | 4 +- drivers/scsi/bfa/bfa_fcbuild.c | 4 +- drivers/scsi/bfa/bfa_fcs.c | 6 +- drivers/scsi/bfa/bfa_fcs_lport.c | 25 ++++--- drivers/scsi/bfa/bfa_ioc.c | 2 +- drivers/scsi/bfa/bfa_svc.c | 2 +- drivers/scsi/bfa/bfad.c | 10 +-- drivers/scsi/bfa/bfad_attr.c | 4 +- drivers/scsi/bfa/bfad_bsg.c | 6 +- drivers/scsi/bfa/bfad_im.c | 2 +- drivers/scsi/bnx2i/bnx2i_init.c | 2 +- drivers/scsi/fcoe/fcoe_transport.c | 2 +- drivers/scsi/gdth.c | 6 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 8 +-- drivers/scsi/lpfc/lpfc_attr.c | 6 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/ncr53c8xx.c | 2 +- drivers/scsi/qedi/qedi_main.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 16 ++--- drivers/scsi/qla2xxx/qla_mr.c | 20 +++--- drivers/scsi/qla4xxx/ql4_mbx.c | 8 +-- drivers/scsi/qla4xxx/ql4_os.c | 14 ++-- drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/scsi/ufs/ufs-qcom.c | 2 +- drivers/soc/fsl/qe/qe.c | 5 +- drivers/soc/qcom/smp2p.c | 2 +- drivers/spi/spi.c | 4 +- drivers/staging/comedi/comedi_fops.c | 4 +- .../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/qlge/qlge_ethtool.c | 6 +- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- .../staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 +- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- drivers/staging/sm750fb/sm750.c | 2 +- .../target/iscsi/iscsi_target_parameters.c | 4 +- drivers/target/iscsi/iscsi_target_util.c | 12 ++-- drivers/target/target_core_configfs.c | 44 +++++-------- drivers/target/target_core_device.c | 6 +- drivers/target/target_core_user.c | 4 +- drivers/thermal/thermal_core.c | 4 +- drivers/thermal/thermal_hwmon.c | 2 +- drivers/tty/hvc/hvcs.c | 2 +- drivers/tty/serial/earlycon.c | 6 +- drivers/tty/serial/serial_core.c | 2 +- drivers/tty/serial/sunsu.c | 6 +- drivers/tty/serial/sunzilog.c | 9 ++- drivers/tty/vt/keyboard.c | 7 +- drivers/usb/atm/usbatm.c | 2 +- drivers/usb/core/devio.c | 3 +- drivers/usb/gadget/function/f_fs.c | 2 +- drivers/usb/gadget/function/f_midi.c | 4 +- drivers/usb/gadget/function/f_printer.c | 8 +-- drivers/usb/gadget/function/f_uvc.c | 2 +- drivers/usb/gadget/function/u_audio.c | 6 +- drivers/usb/gadget/function/u_ether.c | 8 +-- drivers/usb/gadget/function/uvc_v4l2.c | 6 +- drivers/usb/gadget/udc/omap_udc.c | 2 +- drivers/usb/misc/usb251xb.c | 6 +- drivers/usb/storage/onetouch.c | 2 +- drivers/usb/typec/tcpm/fusb302.c | 2 +- drivers/usb/usbip/stub_main.c | 8 +-- drivers/video/console/sticore.c | 2 +- drivers/video/fbdev/aty/atyfb_base.c | 2 +- drivers/video/fbdev/aty/radeon_base.c | 2 +- drivers/video/fbdev/bw2.c | 2 +- drivers/video/fbdev/cirrusfb.c | 2 +- drivers/video/fbdev/clps711x-fb.c | 2 +- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/cyber2000fb.c | 8 +-- drivers/video/fbdev/ffb.c | 2 +- drivers/video/fbdev/geode/gx1fb_core.c | 8 ++- drivers/video/fbdev/gxt4500.c | 2 +- drivers/video/fbdev/i740fb.c | 2 +- drivers/video/fbdev/imxfb.c | 2 +- drivers/video/fbdev/matrox/matroxfb_base.c | 7 +- .../video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- drivers/video/fbdev/pxa168fb.c | 2 +- drivers/video/fbdev/pxafb.c | 2 +- drivers/video/fbdev/s3fb.c | 2 +- drivers/video/fbdev/simplefb.c | 2 +- drivers/video/fbdev/sis/sis_main.c | 4 +- drivers/video/fbdev/sm501fb.c | 2 +- drivers/video/fbdev/sstfb.c | 2 +- drivers/video/fbdev/sunxvr1000.c | 2 +- drivers/video/fbdev/sunxvr2500.c | 2 +- drivers/video/fbdev/sunxvr500.c | 2 +- drivers/video/fbdev/tcx.c | 2 +- drivers/video/fbdev/tdfxfb.c | 4 +- drivers/video/fbdev/tgafb.c | 2 +- drivers/video/fbdev/tridentfb.c | 2 +- drivers/virt/vboxguest/vboxguest_core.c | 3 +- drivers/w1/masters/sgi_w1.c | 2 +- drivers/watchdog/diag288_wdt.c | 12 ++-- drivers/xen/xen-scsiback.c | 2 +- drivers/xen/xenbus/xenbus_probe_frontend.c | 2 +- fs/9p/vfs_inode.c | 4 +- fs/affs/super.c | 2 +- fs/befs/btree.c | 2 +- fs/befs/linuxvfs.c | 2 +- fs/btrfs/check-integrity.c | 2 +- fs/char_dev.c | 2 +- fs/cifs/cifs_unicode.c | 2 +- fs/cifs/cifsroot.c | 2 +- fs/cifs/connect.c | 2 +- fs/cifs/smb2pdu.c | 2 +- fs/dlm/config.c | 6 +- fs/exec.c | 2 +- fs/ext4/file.c | 2 +- fs/gfs2/ops_fstype.c | 10 +-- fs/hostfs/hostfs_kern.c | 2 +- fs/kernfs/dir.c | 27 ++++---- fs/lockd/host.c | 2 +- fs/nfs/nfs4client.c | 2 +- fs/nfs/nfsroot.c | 4 +- fs/nfsd/nfs4idmap.c | 8 +-- fs/nfsd/nfssvc.c | 3 +- fs/ocfs2/dlmfs/dlmfs.c | 2 +- fs/ocfs2/stackglue.c | 4 +- fs/ocfs2/super.c | 10 +-- fs/proc/kcore.c | 2 +- fs/reiserfs/procfs.c | 4 +- fs/super.c | 4 +- fs/vboxsf/super.c | 2 +- include/linux/gameport.h | 2 +- include/linux/suspend.h | 2 +- include/rdma/rdma_vt.h | 2 +- include/trace/events/kyber.h | 8 +-- include/trace/events/task.h | 2 +- include/trace/events/wbt.h | 8 +-- init/do_mounts.c | 2 +- init/main.c | 4 +- kernel/acct.c | 2 +- kernel/cgroup/cgroup-v1.c | 4 +- kernel/cgroup/cgroup.c | 2 +- kernel/events/core.c | 6 +- kernel/kallsyms.c | 4 +- kernel/kprobes.c | 2 +- kernel/module.c | 17 +++-- kernel/params.c | 2 +- kernel/printk/printk.c | 2 +- kernel/relay.c | 4 +- kernel/sched/fair.c | 6 +- kernel/time/clocksource.c | 2 +- kernel/trace/ftrace.c | 19 +++--- kernel/trace/trace.c | 8 +-- kernel/trace/trace_boot.c | 8 +-- kernel/trace/trace_events.c | 2 +- kernel/trace/trace_events_inject.c | 6 +- kernel/trace/trace_kprobe.c | 2 +- kernel/trace/trace_probe.c | 2 +- kernel/trace/trace_uprobe.c | 11 ++-- lib/dynamic_debug.c | 2 +- lib/earlycpio.c | 2 +- lib/kobject_uevent.c | 6 +- mm/dmapool.c | 2 +- mm/kasan/report.c | 2 +- mm/zswap.c | 2 +- net/8021q/vlan_dev.c | 6 +- net/ax25/af_ax25.c | 2 +- net/bluetooth/hidp/core.c | 6 +- net/bridge/br_device.c | 8 +-- net/bridge/br_sysfs_if.c | 4 +- net/bridge/netfilter/ebtables.c | 2 +- net/caif/caif_dev.c | 3 +- net/caif/caif_usb.c | 2 +- net/caif/cfcnfg.c | 4 +- net/caif/cfctrl.c | 2 +- net/core/dev.c | 6 +- net/core/devlink.c | 6 +- net/core/drop_monitor.c | 2 +- net/core/netpoll.c | 4 +- net/dsa/master.c | 2 +- net/dsa/slave.c | 6 +- net/ethtool/ioctl.c | 6 +- net/ieee802154/trace.h | 2 +- net/ipv4/arp.c | 2 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv4/ipconfig.c | 10 +-- net/ipv6/ip6_gre.c | 2 +- net/ipv6/ip6_tunnel.c | 2 +- net/ipv6/ip6_vti.c | 2 +- net/ipv6/sit.c | 2 +- net/l2tp/l2tp_eth.c | 4 +- net/mac80211/iface.c | 2 +- net/mac80211/trace.h | 2 +- net/mac802154/trace.h | 2 +- net/netfilter/ipset/ip_set_core.c | 4 +- net/netfilter/ipset/ip_set_hash_netiface.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 8 +-- net/netfilter/nf_log.c | 4 +- net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nft_osf.c | 2 +- net/netfilter/x_tables.c | 20 +++--- net/netfilter/xt_RATEEST.c | 2 +- net/openvswitch/vport-internal_dev.c | 2 +- net/packet/af_packet.c | 4 +- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- net/sched/sch_teql.c | 2 +- net/sunrpc/clnt.c | 6 +- net/sunrpc/svc.c | 8 +-- net/sunrpc/xprtsock.c | 2 +- net/wireless/ethtool.c | 12 ++-- net/wireless/trace.h | 2 +- samples/trace_events/trace-events-sample.h | 2 +- samples/v4l/v4l2-pci-skeleton.c | 10 +-- security/integrity/ima/ima_api.c | 2 +- security/integrity/ima/ima_policy.c | 8 ++- security/keys/request_key_auth.c | 2 +- sound/aoa/codecs/onyx.c | 2 +- sound/aoa/codecs/tas.c | 2 +- sound/aoa/codecs/toonie.c | 2 +- sound/aoa/core/alsa.c | 9 +-- sound/aoa/fabrics/layout.c | 8 +-- sound/aoa/soundbus/sysfs.c | 2 +- sound/arm/aaci.c | 7 +- sound/arm/pxa2xx-ac97.c | 2 +- sound/core/compress_offload.c | 2 +- sound/core/control.c | 16 ++--- sound/core/ctljack.c | 2 +- sound/core/hwdep.c | 6 +- sound/core/init.c | 4 +- sound/core/oss/mixer_oss.c | 19 ++++-- sound/core/pcm.c | 2 +- sound/core/pcm_native.c | 6 +- sound/core/rawmidi.c | 2 +- sound/core/seq/oss/seq_oss_midi.c | 4 +- sound/core/seq/oss/seq_oss_synth.c | 6 +- sound/core/seq/seq_clientmgr.c | 2 +- sound/core/seq/seq_ports.c | 6 +- sound/core/timer.c | 10 +-- sound/core/timer_compat.c | 4 +- sound/drivers/opl3/opl3_oss.c | 2 +- sound/drivers/opl3/opl3_synth.c | 2 +- sound/firewire/bebob/bebob_hwdep.c | 2 +- sound/firewire/dice/dice-hwdep.c | 2 +- sound/firewire/digi00x/digi00x-hwdep.c | 2 +- sound/firewire/fireface/ff-hwdep.c | 2 +- sound/firewire/fireworks/fireworks_hwdep.c | 2 +- sound/firewire/motu/motu-hwdep.c | 2 +- sound/firewire/oxfw/oxfw-hwdep.c | 2 +- sound/firewire/tascam/tascam-hwdep.c | 2 +- sound/i2c/i2c.c | 4 +- sound/isa/ad1848/ad1848.c | 4 +- sound/isa/cs423x/cs4231.c | 4 +- sound/isa/cs423x/cs4236.c | 4 +- sound/isa/es1688/es1688.c | 4 +- sound/isa/sb/sb16_csp.c | 3 +- sound/isa/sb/sb_mixer.c | 2 +- sound/oss/dmasound/dmasound_core.c | 4 +- sound/pci/cs5535audio/cs5535audio_olpc.c | 4 +- sound/pci/ctxfi/ctpcm.c | 2 +- sound/pci/emu10k1/emu10k1.c | 4 +- sound/pci/emu10k1/emu10k1_main.c | 2 +- sound/pci/emu10k1/emufx.c | 7 +- sound/pci/es1968.c | 2 +- sound/pci/fm801.c | 2 +- sound/pci/hda/hda_auto_parser.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_controller.c | 2 +- sound/pci/hda/hda_eld.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/hda_jack.c | 2 +- sound/pci/ice1712/juli.c | 2 +- sound/pci/ice1712/psc724.c | 8 +-- sound/pci/ice1712/quartet.c | 2 +- sound/pci/ice1712/wm8776.c | 2 +- sound/pci/lola/lola.c | 2 +- sound/pci/lola/lola_pcm.c | 2 +- sound/pci/rme9652/hdspm.c | 4 +- sound/ppc/keywest.c | 2 +- sound/soc/qcom/qdsp6/q6afe.c | 4 +- sound/soc/sh/rcar/core.c | 2 +- sound/usb/bcd2000/bcd2000.c | 2 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/device.c | 6 +- sound/usb/caiaq/midi.c | 2 +- sound/usb/card.c | 8 +-- sound/usb/hiface/chip.c | 8 ++- sound/usb/hiface/pcm.c | 2 +- sound/usb/mixer.c | 19 +++--- sound/usb/mixer_quirks.c | 3 +- sound/usb/mixer_scarlett.c | 2 +- sound/usb/mixer_scarlett_gen2.c | 2 +- sound/usb/mixer_us16x08.c | 2 +- sound/x86/intel_hdmi_audio.c | 2 +- sound/xen/xen_snd_front_cfg.c | 2 +- tools/perf/arch/x86/util/event.c | 2 +- tools/perf/arch/x86/util/machine.c | 2 +- tools/perf/builtin-buildid-cache.c | 6 +- tools/perf/jvmti/libjvmti.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/util/annotate.c | 2 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/dso.c | 2 +- .../util/intel-pt-decoder/intel-pt-decoder.c | 2 +- tools/perf/util/llvm-utils.c | 4 +- tools/perf/util/machine.c | 6 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/probe-file.c | 2 +- tools/perf/util/svghelper.c | 2 +- tools/perf/util/symbol.c | 2 +- tools/perf/util/synthetic-events.c | 4 +- 928 files changed, 1904 insertions(+), 1860 deletions(-)
Signature · 1 line
2.29.2
PATCH 1/2 Manual replacement of the deprecated strlcpy() with return values
The strlcpy() reads the entire source buffer first, it is dangerous if the source buffer lenght is unbounded or possibility non NULL-terminated. It can lead to linear read overflows, crashes, etc...
As recommended in the deprecated interfaces [1], it should be replaced by strscpy.
This commit replaces all calls to strlcpy that handle the return values by the corresponding strscpy calls with new handling of the return values (as it is quite different between the two functions).
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
--- arch/m68k/emu/natfeat.c | 6 +-- crypto/lrw.c | 6 +-- crypto/xts.c | 6 +-- drivers/dma-buf/dma-buf.c | 4 +- drivers/hwmon/pmbus/max20730.c | 66 +++++++++++++------------ drivers/s390/char/diag_ftp.c | 4 +- drivers/s390/char/sclp_ftp.c | 6 +-- drivers/s390/scsi/zfcp_fc.c | 8 +-- drivers/target/target_core_configfs.c | 33 ++++--------- drivers/tty/vt/keyboard.c | 7 ++- drivers/usb/gadget/function/f_midi.c | 4 +- drivers/usb/gadget/function/f_printer.c | 8 +-- drivers/usb/usbip/stub_main.c | 6 +-- drivers/watchdog/diag288_wdt.c | 12 +++-- fs/kernfs/dir.c | 27 +++++----- kernel/cgroup/cgroup.c | 2 +- kernel/module.c | 4 +- kernel/trace/trace_uprobe.c | 11 ++--- lib/kobject_uevent.c | 6 +-- net/core/devlink.c | 6 +-- net/sunrpc/clnt.c | 6 ++- security/integrity/ima/ima_policy.c | 8 ++- sound/usb/card.c | 4 +- 23 files changed, 131 insertions(+), 119 deletions(-)
arch/m68k/emu/natfeat.c +3 -3
@@ -41,10 +41,10 @@ long nf_get_id(const char *feature_name) {/* feature_name may be in vmalloc()ed memory, so make a copy */ char name_copy[32 ]; -size_t n; +ssize_t n; - n =strlcpy (name_copy, feature_name,sizeof (name_copy)); -if (n >=sizeof (name_copy)) + n =strscpy (name_copy, feature_name,sizeof (name_copy)); +if (n == -E2BIG )return 0 ;return nf_get_id_phys (virt_to_phys (name_copy));
crypto/lrw.c +3 -3
@@ -357,10 +357,10 @@ static int lrw_create(struct crypto_template *tmpl, struct rtattr **tb)* cipher name. */ if (!strncmp (cipher_name,"ecb(" ,4 )) { -unsigned len; +ssize_t len; - len =strlcpy (ecb_name, cipher_name +4 ,sizeof (ecb_name)); -if (len <2 || len >=sizeof (ecb_name)) + len =strscpy (ecb_name, cipher_name +4 ,sizeof (ecb_name)); +if (len == -E2BIG || len <2 ) goto err_free_inst;if (ecb_name[len -1 ] !=')' )
crypto/xts.c +3 -3
@@ -395,10 +395,10 @@ static int xts_create(struct crypto_template *tmpl, struct rtattr **tb)* cipher name. */ if (!strncmp (cipher_name,"ecb(" ,4 )) { -unsigned len; +ssize_t len; - len =strlcpy (ctx->name, cipher_name +4 ,sizeof (ctx->name)); -if (len <2 || len >=sizeof (ctx->name)) + len =strscpy (ctx->name, cipher_name +4 ,sizeof (ctx->name)); +if (len == -E2BIG || len <2 ) goto err_free_inst;if (ctx->name[len -1 ] !=')' )
drivers/dma-buf/dma-buf.c +2 -2
@@ -42,12 +42,12 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen) {struct dma_buf *dmabuf;char name[DMA_BUF_NAME_LEN ]; -size_t ret =0 ; +ssize_t ret =0 ; dmabuf = dentry->d_fsdata;spin_lock (&dmabuf->name_lock);if (dmabuf->name) - ret =strlcpy (name, dmabuf->name,DMA_BUF_NAME_LEN ); + ret =strscpy (name, dmabuf->name,DMA_BUF_NAME_LEN );spin_unlock (&dmabuf->name_lock); return dynamic_dname(dentry, buffer, buflen, "/%s:%s",
drivers/hwmon/pmbus/max20730.c +35 -31
138 lines not on this page · raw message
drivers/s390/char/diag_ftp.c +2 -2
@@ -158,8 +158,8 @@ ssize_t diag_ftp_cmd(const struct hmcdrv_ftp_cmdspec *ftp, size_t *fsize) goto out; } - len =strlcpy (ldfpl->fident, ftp->fname,sizeof (ldfpl->fident)); -if (len >=HMCDRV_FTP_FIDENT_MAX ) { + len =strscpy (ldfpl->fident, ftp->fname,sizeof (ldfpl->fident)); +if (len == -E2BIG ) { len = -EINVAL ; goto out_free; }
drivers/s390/char/sclp_ftp.c +3 -3
@@ -87,7 +87,7 @@ static int sclp_ftp_et7(const struct hmcdrv_ftp_cmdspec *ftp)struct completion completion;struct sclp_diag_sccb *sccb;struct sclp_req *req; -size_t len; +ssize_t len;int rc; req =kzalloc (sizeof (*req),GFP_KERNEL );
@@ -114,9 +114,9 @@ static int sclp_ftp_et7(const struct hmcdrv_ftp_cmdspec *ftp) sccb->evbuf.mdd.ftp.length = ftp->len; sccb->evbuf.mdd.ftp.bufaddr =virt_to_phys (ftp->buf); - len =strlcpy (sccb->evbuf.mdd.ftp.fident, ftp->fname, + len =strscpy (sccb->evbuf.mdd.ftp.fident, ftp->fname,HMCDRV_FTP_FIDENT_MAX ); -if (len >=HMCDRV_FTP_FIDENT_MAX ) { +if (len == -E2BIG ) { rc = -EINVAL ; goto out_free; }
drivers/s390/scsi/zfcp_fc.c +5 -3
@@ -877,14 +877,16 @@ static void zfcp_fc_rspn(struct zfcp_adapter *adapter,struct zfcp_fsf_ct_els *ct_els = &fc_req->ct_els;struct zfcp_fc_rspn_req *rspn_req = &fc_req->u.rspn.req;struct fc_ct_hdr *rspn_rsp = &fc_req->u.rspn.rsp; -int ret, len; +int ret; +ssize_t len;zfcp_fc_ct_ns_init (&rspn_req->ct_hdr,FC_NS_RSPN_ID ,FC_SYMBOLIC_NAME_SIZE );hton24 (rspn_req->rspn.fr_fid.fp_fid,fc_host_port_id (shost)); - len =strlcpy (rspn_req->rspn.fr_name,fc_host_symbolic_name (shost), + len =strscpy (rspn_req->rspn.fr_name,fc_host_symbolic_name (shost),FC_SYMBOLIC_NAME_SIZE ); - rspn_req->rspn.fr_name_len = len; +if (len != -E2BIG ) + rspn_req->rspn.fr_name_len = len;sg_init_one (&fc_req->sg_req, rspn_req,sizeof (*rspn_req));sg_init_one (&fc_req->sg_rsp, rspn_rsp,sizeof (*rspn_rsp));
drivers/target/target_core_configfs.c +9 -24
@@ -1325,16 +1325,11 @@ static ssize_t target_wwn_vendor_id_store(struct config_item *item,/* +2 to allow for a trailing (stripped) '\n' and null-terminator */ unsigned char buf[INQUIRY_VENDOR_LEN +2 ];char *stripped =NULL ; -size_t len; +ssize_t len;ssize_t ret; - len =strlcpy (buf, page,sizeof (buf)); -if (len <sizeof (buf)) { -/* Strip any newline added from userspace. */ - stripped =strstrip (buf); - len =strlen (stripped); - } -if (len >INQUIRY_VENDOR_LEN ) { + len =strscpy (buf, page,sizeof (buf)); +if (len == -E2BIG ) { pr_err("Emulated T10 Vendor Identification exceeds" " INQUIRY_VENDOR_LEN: " __stringify(INQUIRY_VENDOR_LEN)"\n" );
@@ -1381,16 +1376,11 @@ static ssize_t target_wwn_product_id_store(struct config_item *item,/* +2 to allow for a trailing (stripped) '\n' and null-terminator */ unsigned char buf[INQUIRY_MODEL_LEN +2 ];char *stripped =NULL ; -size_t len; +ssize_t len;ssize_t ret; - len =strlcpy (buf, page,sizeof (buf)); -if (len <sizeof (buf)) { -/* Strip any newline added from userspace. */ - stripped =strstrip (buf); - len =strlen (stripped); - } -if (len >INQUIRY_MODEL_LEN ) { + len =strscpy (buf, page,sizeof (buf)); +if (len == -E2BIG ) { pr_err("Emulated T10 Vendor exceeds INQUIRY_MODEL_LEN: " __stringify(INQUIRY_MODEL_LEN)"\n" );
@@ -1437,16 +1427,11 @@ static ssize_t target_wwn_revision_store(struct config_item *item,/* +2 to allow for a trailing (stripped) '\n' and null-terminator */ unsigned char buf[INQUIRY_REVISION_LEN +2 ];char *stripped =NULL ; -size_t len; +ssize_t len;ssize_t ret; - len =strlcpy (buf, page,sizeof (buf)); -if (len <sizeof (buf)) { -/* Strip any newline added from userspace. */ - stripped =strstrip (buf); - len =strlen (stripped); - } -if (len >INQUIRY_REVISION_LEN ) { + len =strscpy (buf, page,sizeof (buf)); +if (len == -E2BIG ) { pr_err("Emulated T10 Revision exceeds INQUIRY_REVISION_LEN: " __stringify(INQUIRY_REVISION_LEN)"\n" );
drivers/tty/vt/keyboard.c +6 -1
@@ -2031,9 +2031,14 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)ssize_t len =sizeof (user_kdgkb->kb_string);spin_lock_irqsave (&func_buf_lock, flags); - len =strlcpy (kbs->kb_string, func_table[i] ? :"" , len); + len =strscpy (kbs->kb_string, func_table[i] ? :"" , len);spin_unlock_irqrestore (&func_buf_lock, flags); +if (len == -E2BIG ) { + ret = -E2BIG ; + goto reterr; + } + ret =copy_to_user (user_kdgkb->kb_string, kbs->kb_string, len +1 ) ? -EFAULT :0 ;
drivers/usb/gadget/function/f_midi.c +2 -2
@@ -1135,11 +1135,11 @@ F_MIDI_OPT(out_ports, true, MAX_PORTS);static ssize_t f_midi_opts_id_show (struct config_item *item,char *page) {struct f_midi_opts *opts =to_f_midi_opts (item); -int result; +ssize_t result;mutex_lock (&opts->lock);if (opts->id) { - result =strlcpy (page, opts->id,PAGE_SIZE ); + result =strscpy (page, opts->id,PAGE_SIZE ); }else { page[0 ] =0 ; result =0 ;
drivers/usb/gadget/function/f_printer.c +4 -4
@@ -1209,15 +1209,15 @@ static ssize_t f_printer_opts_pnp_string_show(struct config_item *item, char *page) {struct f_printer_opts *opts =to_f_printer_opts (item); -int result =0 ; +ssize_t result =0 ;mutex_lock (&opts->lock);if (!opts->pnp_string) goto unlock; - result =strlcpy (page, opts->pnp_string,PAGE_SIZE ); -if (result >=PAGE_SIZE ) { - result =PAGE_SIZE ; + result =strscpy (page, opts->pnp_string,PAGE_SIZE ); +if (result == -E2BIG ) { + goto unlock; }else if (page[result -1 ] !='\n' && result +1 <PAGE_SIZE ) { page[result++] ='\n' ; page[result] ='\0' ;
drivers/usb/usbip/stub_main.c +3 -3
@@ -169,15 +169,15 @@ static ssize_t match_busid_show(struct device_driver *drv, char *buf)static ssize_t match_busid_store (struct device_driver *dev,const char *buf,size_t count) { -int len; +ssize_t len;char busid[BUSID_SIZE ];if (count <5 )return -EINVAL ;/* busid needs to include \0 termination */ - len =strlcpy (busid, buf +4 ,BUSID_SIZE ); -if (sizeof (busid) <= len) + len =strscpy (busid, buf +4 ,BUSID_SIZE ); +if (len == -E2BIG )return -EINVAL ;if (!strncmp (buf,"add " ,4 )) {
drivers/watchdog/diag288_wdt.c +8 -4
@@ -111,7 +111,7 @@ static unsigned long wdt_status;static int wdt_start (struct watchdog_device *dev) {char *ebc_cmd; -size_t len; +ssize_t len;int ret;unsigned int func;
@@ -126,7 +126,9 @@ static int wdt_start(struct watchdog_device *dev)clear_bit (DIAG_WDOG_BUSY , &wdt_status);return -ENOMEM ; } - len =strlcpy (ebc_cmd, wdt_cmd,MAX_CMDLEN ); + len =strscpy (ebc_cmd, wdt_cmd,MAX_CMDLEN ); +if (len == -E2BIG ) +return -E2BIG ;ASCEBC (ebc_cmd,MAX_CMDLEN );EBC_TOUPPER (ebc_cmd,MAX_CMDLEN );
@@ -163,7 +165,7 @@ static int wdt_stop(struct watchdog_device *dev)static int wdt_ping (struct watchdog_device *dev) {char *ebc_cmd; -size_t len; +ssize_t len;int ret;unsigned int func;
@@ -173,7 +175,9 @@ static int wdt_ping(struct watchdog_device *dev) ebc_cmd =kmalloc (MAX_CMDLEN ,GFP_KERNEL );if (!ebc_cmd)return -ENOMEM ; - len =strlcpy (ebc_cmd, wdt_cmd,MAX_CMDLEN ); + len =strscpy (ebc_cmd, wdt_cmd,MAX_CMDLEN ); +if (len == -E2BIG ) +return -E2BIG ;ASCEBC (ebc_cmd,MAX_CMDLEN );EBC_TOUPPER (ebc_cmd,MAX_CMDLEN );
fs/kernfs/dir.c +14 -13
@@ -42,9 +42,9 @@ static bool kernfs_lockdep(struct kernfs_node *kn)static int kernfs_name_locked (struct kernfs_node *kn,char *buf,size_t buflen) {if (!kn) -return strlcpy (buf,"(null)" , buflen); +return strscpy (buf,"(null)" , buflen); -return strlcpy (buf, kn->parent ? kn->name :"/" , buflen); +return strscpy (buf, kn->parent ? kn->name :"/" , buflen); }/* kernfs_node_depth - compute depth from @from to @to */
@@ -125,17 +125,18 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to, {struct kernfs_node *kn, *common;const char parent_str[] ="/.." ; -size_t depth_from, depth_to, len =0 ; +size_t depth_from, depth_to; +ssize_t len =0 ;int i, j;if (!kn_to) -return strlcpy (buf,"(null)" , buflen); +return strscpy (buf,"(null)" , buflen);if (!kn_from) kn_from =kernfs_root (kn_to)->kn;if (kn_from == kn_to) -return strlcpy (buf,"/" , buflen); +return strscpy (buf,"/" , buflen);if (!buf)return -EINVAL ;
@@ -150,16 +151,16 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to, buf[0 ] ='\0' ;for (i =0 ; i < depth_from; i++) - len +=strlcpy (buf + len, parent_str, + len +=strscpy (buf + len, parent_str, len < buflen ? buflen - len :0 );/* Calculate how many bytes we need for the rest */ for (i = depth_to -1 ; i >=0 ; i--) {for (kn = kn_to, j =0 ; j < i; j++) kn = kn->parent; - len +=strlcpy (buf + len,"/" , + len +=strscpy (buf + len,"/" , len < buflen ? buflen - len :0 ); - len +=strlcpy (buf + len, kn->name, + len +=strscpy (buf + len, kn->name, len < buflen ? buflen - len :0 ); }
@@ -173,8 +174,8 @@ static int kernfs_path_from_node_locked(struct kernfs_node *kn_to,* @buflen: size of @buf * * Copies the name of @kn into @buf of @buflen bytes. The behavior is -* similar to strlcpy(). It returns the length of @kn's name and if @buf -* isn't long enough, it's filled upto @buflen-1 and nul terminated. +* similar to strscpy(). It returns the length of @kn's name and if @buf +* isn't long enough or @buflen is 0, it returns -E2BIG. * * Fills buffer with "(null)" if @kn is NULL. *
@@ -859,7 +860,7 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent,const unsigned char *path, const void *ns) { - size_t len; + ssize_t len;char *p, *name;lockdep_assert_held (&kernfs_mutex);
@@ -867,9 +868,9 @@ static struct kernfs_node *kernfs_walk_ns(struct kernfs_node *parent,/* grab kernfs_rename_lock to piggy back on kernfs_pr_cont_buf */ spin_lock_irq (&kernfs_rename_lock); - len =strlcpy (kernfs_pr_cont_buf, path,sizeof (kernfs_pr_cont_buf)); + len =strscpy (kernfs_pr_cont_buf, path,sizeof (kernfs_pr_cont_buf)); -if (len >=sizeof (kernfs_pr_cont_buf)) { +if (len == -E2BIG ) {spin_unlock_irq (&kernfs_rename_lock);return NULL ; }
kernel/cgroup/cgroup.c +1 -1
@@ -2268,7 +2268,7 @@ int task_cgroup_path(struct task_struct *task, char *buf, size_t buflen) ret =cgroup_path_ns_locked (cgrp, buf, buflen, &init_cgroup_ns); }else {/* if no hierarchy exists, everyone is in "/" */ - ret =strlcpy (buf,"/" , buflen); + ret =strscpy (buf,"/" , buflen); }spin_unlock_irq (&css_set_lock);
kernel/module.c +3 -1
@@ -2777,6 +2777,7 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)Elf_Sym *dst;char *s;Elf_Shdr *symsec = &info->sechdrs[info->index.sym]; +ssize_t len;/* Set up to point into init section. */ mod->kallsyms = mod->init_layout.base + info->mod_kallsyms_init_off;
@@ -2804,8 +2805,9 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) mod->kallsyms->typetab[i]; dst[ndst] = src[i]; dst[ndst++].st_name = s - mod->core_kallsyms.strtab; - s +=strlcpy (s, &mod->kallsyms->strtab[src[i].st_name], + len =strscpy (s, &mod->kallsyms->strtab[src[i].st_name],KSYM_NAME_LEN ) +1 ; + s += (len != -E2BIG ) ? len :0 ; } } mod->core_kallsyms.num_symtab = ndst;
kernel/trace/trace_uprobe.c +5 -6
@@ -154,12 +154,11 @@ fetch_store_string(unsigned long addr, void *dest, void *base)u8 *dst =get_loc_data (dest, base);void __user *src = (void __force __user *) addr; -if (unlikely (!maxlen)) -return -ENOMEM ; - -if (addr ==FETCH_TOKEN_COMM ) - ret =strlcpy (dst, current->comm, maxlen); -else +if (addr ==FETCH_TOKEN_COMM ) { + ret =strscpy (dst, current->comm, maxlen); +if (ret == -E2BIG ) +return -ENOMEM ; + }else ret =strncpy_from_user (dst, src, maxlen);if (ret >=0 ) {if (ret == maxlen)
lib/kobject_uevent.c +3 -3
@@ -251,11 +251,11 @@ static int kobj_usermode_filter(struct kobject *kobj)static int init_uevent_argv (struct kobj_uevent_env *env,const char *subsystem) { -int len; +ssize_t len; - len =strlcpy (&env->buf[env->buflen], subsystem, + len =strscpy (&env->buf[env->buflen], subsystem,sizeof (env->buf) - env->buflen); -if (len >= (sizeof (env->buf) - env->buflen)) { +if (len == -E2BIG ) {WARN (1 ,KERN_ERR "init_uevent_argv: buffer size too small\n" );return -ENOMEM ; }
net/core/devlink.c +3 -3
@@ -9200,10 +9200,10 @@ EXPORT_SYMBOL_GPL(devlink_port_param_value_changed);void devlink_param_value_str_fill (union devlink_param_value *dst_val,const char *src) { -size_t len; +ssize_t len; - len =strlcpy (dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE); -WARN_ON (len >= __DEVLINK_PARAM_MAX_STRING_VALUE); + len =strscpy (dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE); +WARN_ON (len == -E2BIG ); }EXPORT_SYMBOL_GPL (devlink_param_value_str_fill);
net/sunrpc/clnt.c +5 -1
@@ -282,7 +282,7 @@ static struct rpc_xprt *rpc_clnt_set_transport(struct rpc_clnt *clnt,static void rpc_clnt_set_nodename (struct rpc_clnt *clnt,const char *nodename) { - clnt->cl_nodelen =strlcpy (clnt->cl_nodename, + clnt->cl_nodelen =strscpy (clnt->cl_nodename, nodename,sizeof (clnt->cl_nodename)); }
@@ -422,6 +422,10 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, nodename =utsname ()->nodename;/* save the nodename */ rpc_clnt_set_nodename (clnt, nodename); +if (clnt->cl_nodelen == -E2BIG ) { + err = -ENOMEM ; + goto out_no_path; + } err =rpc_client_register (clnt, args->authflavor, args->client_name);if (err)
security/integrity/ima/ima_policy.c +7 -1
@@ -760,8 +760,14 @@ static int __init ima_init_arch_policy(void)for (rules = arch_rules, i =0 ; *rules !=NULL ; rules++) {char rule[255 ];int result; +ssize_t len; - result =strlcpy (rule, *rules,sizeof (rule)); + len =strscpy (rule, *rules,sizeof (rule)); +if (len == -E2BIG ) { +pr_warn ("Internal copy of architecture policy rule '%s' " +"failed. Skipping.\n" , *rules); +continue ; + }INIT_LIST_HEAD (&arch_policy_entry[i].list); result =ima_parse_rule (rule, &arch_policy_entry[i]);
sound/usb/card.c +2 -2
@@ -494,7 +494,7 @@ static void usb_audio_make_longname(struct usb_device *dev,struct snd_card *card = chip->card;const struct usb_audio_device_name *preset;const char *s =NULL ; -int len; +ssize_t len; preset =lookup_device_name (chip->usb_id);
@@ -511,7 +511,7 @@ static void usb_audio_make_longname(struct usb_device *dev,else if (quirk && quirk->vendor_name) s = quirk->vendor_name;if (s && *s) { - len =strlcpy (card->longname, s,sizeof (card->longname)); + len =strscpy (card->longname, s,sizeof (card->longname)); }else {/* retrieve the vendor and device strings as longname */ if (dev->descriptor.iManufacturer)
Signature · 1 line
2.29.2
PATCH 2/2 Automated replacement of all other deprecated strlcpy()
In reply to Romain PerierThe strlcpy() reads the entire source buffer first, it is dangerous if the source buffer lenght is unbounded or possibility non NULL-terminated. It can lead to linear read overflows, crashes, etc...
As recommended in the deprecated interfaces [1], it should be replaced by strscpy.
This commit replaces all other calls to strcpy() by the corresponding call to strscpy(). All has been done automatically by using the following Cocinelle script:
virtual patch
@@
identifier d, s;
expression size;
@@
-strlcpy(d, s, size)
+strscpy(d, s, size)
@@
identifier a, x;
expression s, size;
@@
-strlcpy(a->x, s, size)
+strscpy(a->x, s, size)
@@
identifier a, x;
expression s, size;
@@
-strlcpy(a.x, s, size)
+strscpy(a.x, s, size)
@@
identifier a;
expression s, size;
@@
-strlcpy(a, s, size)
+strscpy(a, s, size)
@@
expression d, s, size;
@@
-strlcpy(d, s, size)
+strscpy(d, s, size)
@@
identifier d, s, size;
@@
-strlcpy(d, s, size)
+strscpy(d, s, size)
[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
--- arch/alpha/kernel/setup.c | 5 ++-- arch/arm/kernel/atags_parse.c | 4 +-- arch/arm/kernel/setup.c | 2 +- arch/arm/kernel/vdso.c | 2 +- arch/arm/mach-s3c/mach-mini2440.c | 2 +- arch/arm/mach-s3c/mach-mini6410.c | 2 +- arch/arm/mach-s3c/mach-real6410.c | 2 +- arch/hexagon/kernel/setup.c | 6 ++--- arch/ia64/kernel/setup.c | 2 +- arch/m68k/kernel/setup_mm.c | 2 +- arch/microblaze/kernel/prom.c | 2 +- arch/mips/bcm47xx/board.c | 2 +- arch/mips/kernel/prom.c | 6 ++--- arch/mips/kernel/relocate.c | 2 +- arch/mips/kernel/setup.c | 6 ++--- arch/mips/pic32/pic32mzda/init.c | 2 +- arch/nios2/kernel/cpuinfo.c | 2 +- arch/nios2/kernel/setup.c | 6 ++--- arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/setup.c | 2 +- arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- arch/powerpc/kernel/vdso.c | 4 +-- arch/powerpc/platforms/pasemi/misc.c | 3 +-- arch/powerpc/platforms/powermac/bootx_init.c | 2 +- arch/powerpc/platforms/powernv/idle.c | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/hvcserver.c | 2 +- arch/riscv/kernel/setup.c | 2 +- arch/s390/kernel/debug.c | 2 +- arch/s390/kernel/early.c | 2 +- arch/sh/drivers/dma/dma-api.c | 2 +- arch/sh/kernel/setup.c | 4 +-- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/kernel/setup_32.c | 2 +- arch/sparc/kernel/setup_64.c | 2 +- arch/sparc/prom/bootstr_32.c | 3 ++- arch/um/drivers/net_kern.c | 2 +- arch/um/drivers/vector_kern.c | 2 +- arch/um/kernel/um_arch.c | 2 +- arch/um/os-Linux/drivers/tuntap_user.c | 2 +- arch/um/os-Linux/umid.c | 6 ++--- arch/x86/kernel/setup.c | 6 ++--- arch/xtensa/kernel/setup.c | 8 +++--- arch/xtensa/platforms/iss/network.c | 4 +-- block/elevator.c | 2 +- block/genhd.c | 2 +- crypto/api.c | 2 +- crypto/essiv.c | 2 +- drivers/acpi/bus.c | 4 +-- drivers/acpi/processor_idle.c | 8 +++--- drivers/acpi/utils.c | 6 ++--- drivers/base/dd.c | 2 +- drivers/block/drbd/drbd_nl.c | 3 ++- drivers/block/mtip32xx/mtip32xx.c | 20 +++++++-------- drivers/block/ps3vram.c | 2 +- drivers/block/rnbd/rnbd-clt-sysfs.c | 6 ++--- drivers/block/rnbd/rnbd-clt.c | 6 ++--- drivers/block/rnbd/rnbd-srv.c | 6 ++--- drivers/block/zram/zram_drv.c | 7 +++--- drivers/char/ipmi/ipmi_ssif.c | 2 +- drivers/char/tpm/tpm_ppi.c | 2 +- drivers/clk/clkdev.c | 2 +- drivers/clk/mvebu/dove-divider.c | 2 +- drivers/clk/tegra/clk-bpmp.c | 2 +- drivers/cpuidle/cpuidle-powernv.c | 4 +-- .../crypto/marvell/octeontx/otx_cptpf_ucode.c | 6 ++--- drivers/crypto/qat/qat_common/adf_cfg.c | 6 ++--- drivers/crypto/qat/qat_common/adf_ctl_drv.c | 3 ++- .../qat/qat_common/adf_transport_debug.c | 2 +- drivers/dma-buf/sw_sync.c | 2 +- drivers/dma-buf/sync_file.c | 8 +++--- drivers/dma/dmatest.c | 12 ++++----- drivers/dma/xilinx/xilinx_dpdma.c | 2 +- drivers/eisa/eisa-bus.c | 3 +-- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/reset.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 3 ++- drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2 +- .../drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 6 ++--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/drm_dp_helper.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- drivers/gpu/drm/drm_mipi_dsi.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 2 +- drivers/gpu/drm/msm/dp/dp_parser.c | 9 ++++--- drivers/gpu/drm/radeon/radeon_atombios.c | 4 +-- drivers/gpu/drm/radeon/radeon_combios.c | 4 +-- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 2 +- drivers/hid/hid-steam.c | 12 ++++----- drivers/hid/i2c-hid/i2c-hid-core.c | 2 +- drivers/hid/usbhid/hid-core.c | 2 +- drivers/hid/usbhid/usbkbd.c | 2 +- drivers/hid/usbhid/usbmouse.c | 2 +- drivers/hid/wacom_sys.c | 6 ++--- drivers/hwmon/adc128d818.c | 2 +- drivers/hwmon/adm1021.c | 2 +- drivers/hwmon/adm1025.c | 2 +- drivers/hwmon/adm1026.c | 2 +- drivers/hwmon/adm1029.c | 2 +- drivers/hwmon/adm1031.c | 2 +- drivers/hwmon/adm9240.c | 2 +- drivers/hwmon/adt7411.c | 2 +- drivers/hwmon/adt7462.c | 2 +- drivers/hwmon/adt7470.c | 2 +- drivers/hwmon/adt7475.c | 2 +- drivers/hwmon/amc6821.c | 2 +- drivers/hwmon/asb100.c | 2 +- drivers/hwmon/asc7621.c | 2 +- drivers/hwmon/dell-smm-hwmon.c | 6 ++--- drivers/hwmon/dme1737.c | 2 +- drivers/hwmon/emc1403.c | 12 ++++----- drivers/hwmon/emc2103.c | 2 +- drivers/hwmon/emc6w201.c | 2 +- drivers/hwmon/f75375s.c | 2 +- drivers/hwmon/fschmd.c | 2 +- drivers/hwmon/ftsteutates.c | 2 +- drivers/hwmon/gl518sm.c | 2 +- drivers/hwmon/gl520sm.c | 2 +- drivers/hwmon/jc42.c | 2 +- drivers/hwmon/lm63.c | 6 ++--- drivers/hwmon/lm73.c | 2 +- drivers/hwmon/lm75.c | 2 +- drivers/hwmon/lm77.c | 2 +- drivers/hwmon/lm78.c | 2 +- drivers/hwmon/lm80.c | 2 +- drivers/hwmon/lm83.c | 2 +- drivers/hwmon/lm85.c | 2 +- drivers/hwmon/lm87.c | 2 +- drivers/hwmon/lm90.c | 2 +- drivers/hwmon/lm92.c | 2 +- drivers/hwmon/lm93.c | 2 +- drivers/hwmon/lm95234.c | 2 +- drivers/hwmon/lm95241.c | 2 +- drivers/hwmon/lm95245.c | 2 +- drivers/hwmon/max1619.c | 2 +- drivers/hwmon/max1668.c | 2 +- drivers/hwmon/max31730.c | 2 +- drivers/hwmon/max6639.c | 2 +- drivers/hwmon/max6642.c | 2 +- drivers/hwmon/nct7802.c | 2 +- drivers/hwmon/nct7904.c | 2 +- drivers/hwmon/sch56xx-common.c | 2 +- drivers/hwmon/smsc47m192.c | 2 +- drivers/hwmon/stts751.c | 2 +- drivers/hwmon/thmc50.c | 2 +- drivers/hwmon/tmp401.c | 2 +- drivers/hwmon/tmp421.c | 2 +- drivers/hwmon/w83781d.c | 2 +- drivers/hwmon/w83791d.c | 2 +- drivers/hwmon/w83792d.c | 2 +- drivers/hwmon/w83793.c | 2 +- drivers/hwmon/w83795.c | 2 +- drivers/hwmon/w83l785ts.c | 2 +- drivers/hwmon/w83l786ng.c | 2 +- drivers/i2c/busses/i2c-altera.c | 2 +- drivers/i2c/busses/i2c-aspeed.c | 2 +- drivers/i2c/busses/i2c-au1550.c | 2 +- drivers/i2c/busses/i2c-axxia.c | 2 +- drivers/i2c/busses/i2c-bcm-kona.c | 2 +- drivers/i2c/busses/i2c-brcmstb.c | 2 +- drivers/i2c/busses/i2c-cbus-gpio.c | 2 +- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +- drivers/i2c/busses/i2c-davinci.c | 2 +- drivers/i2c/busses/i2c-digicolor.c | 2 +- drivers/i2c/busses/i2c-efm32.c | 2 +- drivers/i2c/busses/i2c-eg20t.c | 3 ++- drivers/i2c/busses/i2c-emev2.c | 2 +- drivers/i2c/busses/i2c-exynos5.c | 2 +- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 2 +- drivers/i2c/busses/i2c-hix5hd2.c | 2 +- drivers/i2c/busses/i2c-i801.c | 6 ++--- drivers/i2c/busses/i2c-ibm_iic.c | 2 +- drivers/i2c/busses/i2c-icy.c | 2 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- drivers/i2c/busses/i2c-imx.c | 3 ++- drivers/i2c/busses/i2c-lpc2k.c | 2 +- drivers/i2c/busses/i2c-meson.c | 3 +-- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-mt7621.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- drivers/i2c/busses/i2c-mxs.c | 2 +- drivers/i2c/busses/i2c-nvidia-gpu.c | 4 +-- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/i2c/busses/i2c-opal.c | 4 +-- drivers/i2c/busses/i2c-parport.c | 2 +- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-qcom-geni.c | 2 +- drivers/i2c/busses/i2c-qup.c | 2 +- drivers/i2c/busses/i2c-rcar.c | 2 +- drivers/i2c/busses/i2c-riic.c | 2 +- drivers/i2c/busses/i2c-rk3x.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 2 +- drivers/i2c/busses/i2c-sh_mobile.c | 2 +- drivers/i2c/busses/i2c-simtec.c | 2 +- drivers/i2c/busses/i2c-sirf.c | 2 +- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/i2c/busses/i2c-sun6i-p2wi.c | 2 +- drivers/i2c/busses/i2c-taos-evm.c | 2 +- drivers/i2c/busses/i2c-tegra-bpmp.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 2 +- drivers/i2c/busses/i2c-uniphier-f.c | 2 +- drivers/i2c/busses/i2c-uniphier.c | 2 +- drivers/i2c/busses/i2c-versatile.c | 3 ++- drivers/i2c/busses/i2c-wmt.c | 2 +- drivers/i2c/busses/i2c-zx2967.c | 3 +-- drivers/i2c/i2c-core-base.c | 2 +- drivers/i2c/i2c-smbus.c | 2 +- drivers/idle/intel_idle.c | 2 +- .../iio/common/st_sensors/st_sensors_core.c | 2 +- drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 4 +-- drivers/infiniband/core/cma_configfs.c | 2 +- drivers/infiniband/core/device.c | 4 +-- drivers/infiniband/hw/bnxt_re/main.c | 2 +- drivers/infiniband/hw/efa/efa_main.c | 4 +-- drivers/infiniband/hw/hfi1/file_ops.c | 2 +- drivers/infiniband/hw/hfi1/verbs.c | 2 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 3 ++- drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 +-- .../ulp/opa_vnic/opa_vnic_ethtool.c | 5 ++-- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 ++--- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 6 ++--- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- drivers/input/keyboard/lkkbd.c | 8 +++--- drivers/input/misc/keyspan_remote.c | 3 ++- drivers/input/mouse/hgpk.c | 2 +- drivers/input/mouse/synaptics.c | 4 +-- drivers/input/mouse/synaptics_usb.c | 2 +- drivers/input/mouse/vsxxxaa.c | 4 +-- drivers/input/rmi4/rmi_f03.c | 2 +- drivers/input/rmi4/rmi_f54.c | 8 +++--- drivers/input/serio/altera_ps2.c | 4 +-- drivers/input/serio/ambakmi.c | 4 +-- drivers/input/serio/ams_delta_serio.c | 5 ++-- drivers/input/serio/apbps2.c | 2 +- drivers/input/serio/ct82c710.c | 2 +- drivers/input/serio/gscps2.c | 2 +- drivers/input/serio/hyperv-keyboard.c | 4 +-- drivers/input/serio/i8042-x86ia64io.h | 6 ++--- drivers/input/serio/i8042.c | 14 +++++------ drivers/input/serio/olpc_apsp.c | 8 +++--- drivers/input/serio/parkbd.c | 3 ++- drivers/input/serio/pcips2.c | 4 +-- drivers/input/serio/ps2-gpio.c | 4 +-- drivers/input/serio/ps2mult.c | 2 +- drivers/input/serio/q40kbd.c | 4 +-- drivers/input/serio/rpckbd.c | 4 +-- drivers/input/serio/sa1111ps2.c | 4 +-- drivers/input/serio/serport.c | 2 +- drivers/input/serio/sun4i-ps2.c | 4 +-- drivers/input/tablet/acecad.c | 2 +- drivers/input/tablet/hanwang.c | 2 +- drivers/input/tablet/pegasus_notetaker.c | 2 +- drivers/input/touchscreen/atmel_mxt_ts.c | 8 +++--- drivers/input/touchscreen/edt-ft5x06.c | 12 ++++----- drivers/input/touchscreen/exc3000.c | 4 +-- drivers/input/touchscreen/sur40.c | 6 ++--- drivers/input/touchscreen/usbtouchscreen.c | 3 ++- drivers/input/touchscreen/wacom_w8001.c | 7 +++--- drivers/isdn/capi/kcapi.c | 4 +-- drivers/leds/led-class.c | 2 +- drivers/leds/leds-aat1290.c | 2 +- drivers/leds/leds-as3645a.c | 4 +-- drivers/leds/leds-blinkm.c | 2 +- drivers/leds/leds-spi-byte.c | 2 +- drivers/lightnvm/core.c | 6 ++--- drivers/macintosh/therm_windtunnel.c | 4 +-- drivers/md/dm-ioctl.c | 4 +-- drivers/md/md-bitmap.c | 6 ++--- drivers/md/md-cluster.c | 2 +- drivers/md/md.c | 6 ++--- drivers/message/fusion/mptbase.c | 6 ++--- drivers/message/fusion/mptctl.c | 5 ++-- drivers/mfd/htc-i2cpld.c | 2 +- drivers/mfd/lpc_ich.c | 2 +- drivers/mfd/mfd-core.c | 2 +- drivers/misc/altera-stapl/altera.c | 15 +++++------ drivers/misc/eeprom/eeprom.c | 2 +- drivers/misc/eeprom/idt_89hpesx.c | 2 +- drivers/misc/habanalabs/common/device.c | 2 +- drivers/misc/ics932s401.c | 2 +- drivers/misc/mei/bus-fixup.c | 2 +- drivers/most/configfs.c | 8 +++--- drivers/mtd/devices/block2mtd.c | 2 +- drivers/mtd/parsers/cmdlinepart.c | 4 +-- drivers/net/bonding/bond_main.c | 2 +- drivers/net/can/sja1000/peak_pcmcia.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/dsa/b53/b53_common.c | 4 +-- drivers/net/dsa/bcm_sf2_cfp.c | 4 +-- drivers/net/dsa/mv88e6xxx/chip.c | 5 ++-- drivers/net/dsa/sja1105/sja1105_ethtool.c | 4 +-- drivers/net/dummy.c | 2 +- drivers/net/ethernet/3com/3c509.c | 2 +- drivers/net/ethernet/3com/3c515.c | 2 +- drivers/net/ethernet/3com/3c589_cs.c | 2 +- drivers/net/ethernet/3com/3c59x.c | 6 ++--- drivers/net/ethernet/3com/typhoon.c | 8 +++--- drivers/net/ethernet/8390/ax88796.c | 6 ++--- drivers/net/ethernet/8390/etherh.c | 6 ++--- drivers/net/ethernet/adaptec/starfire.c | 4 +-- drivers/net/ethernet/aeroflex/greth.c | 4 +-- drivers/net/ethernet/agere/et131x.c | 4 +-- drivers/net/ethernet/alacritech/slicoss.c | 4 +-- drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +-- drivers/net/ethernet/alteon/acenic.c | 6 ++--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +-- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/amd/amd8111e.c | 4 +-- drivers/net/ethernet/amd/au1000_eth.c | 2 +- drivers/net/ethernet/amd/nmclan_cs.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 6 ++--- drivers/net/ethernet/amd/sunlance.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +-- .../ethernet/aquantia/atlantic/aq_ethtool.c | 2 +- drivers/net/ethernet/arc/emac_main.c | 2 +- drivers/net/ethernet/atheros/ag71xx.c | 4 +-- .../ethernet/atheros/atl1c/atl1c_ethtool.c | 4 +-- .../ethernet/atheros/atl1e/atl1e_ethtool.c | 6 ++--- drivers/net/ethernet/atheros/atlx/atl1.c | 4 +-- drivers/net/ethernet/atheros/atlx/atl2.c | 6 ++--- drivers/net/ethernet/broadcom/b44.c | 7 +++--- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 ++-- drivers/net/ethernet/broadcom/bcmsysport.c | 4 +-- drivers/net/ethernet/broadcom/bgmac.c | 8 +++--- drivers/net/ethernet/broadcom/bnx2.c | 6 ++--- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- .../ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 ++--- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 ++++----- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 6 ++--- .../net/ethernet/brocade/bna/bnad_ethtool.c | 6 ++--- .../net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- .../ethernet/cavium/thunder/nicvf_ethtool.c | 4 +-- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 4 +-- .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +-- .../ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +-- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +-- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 4 +-- .../chelsio/inline_crypto/chtls/chtls_main.c | 2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- .../net/ethernet/cisco/enic/enic_ethtool.c | 6 ++--- drivers/net/ethernet/davicom/dm9000.c | 4 +-- drivers/net/ethernet/dec/tulip/de2104x.c | 4 +-- drivers/net/ethernet/dec/tulip/dmfe.c | 4 +-- drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +-- drivers/net/ethernet/dec/tulip/uli526x.c | 4 +-- drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +-- drivers/net/ethernet/dlink/dl2k.c | 4 +-- drivers/net/ethernet/dlink/sundance.c | 4 +-- drivers/net/ethernet/dnet.c | 4 +-- drivers/net/ethernet/emulex/benet/be_cmds.c | 16 ++++++------ .../net/ethernet/emulex/benet/be_ethtool.c | 6 ++--- drivers/net/ethernet/faraday/ftgmac100.c | 5 ++-- drivers/net/ethernet/faraday/ftmac100.c | 5 ++-- drivers/net/ethernet/fealnx.c | 4 +-- .../ethernet/freescale/dpaa/dpaa_ethtool.c | 5 ++-- .../ethernet/freescale/dpaa2/dpaa2-ethtool.c | 8 +++--- .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- .../ethernet/freescale/enetc/enetc_ethtool.c | 4 +-- drivers/net/ethernet/freescale/fec_main.c | 9 ++++--- drivers/net/ethernet/freescale/fec_ptp.c | 2 +- .../ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- .../net/ethernet/freescale/gianfar_ethtool.c | 2 +- .../net/ethernet/freescale/ucc_geth_ethtool.c | 4 +-- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +-- drivers/net/ethernet/google/gve/gve_ethtool.c | 6 ++--- drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +-- .../net/ethernet/huawei/hinic/hinic_ethtool.c | 4 +-- drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 4 +-- drivers/net/ethernet/ibm/emac/core.c | 4 +-- drivers/net/ethernet/ibm/ibmveth.c | 4 +-- drivers/net/ethernet/ibm/ibmvnic.c | 6 ++--- drivers/net/ethernet/intel/e100.c | 5 ++-- .../net/ethernet/intel/e1000/e1000_ethtool.c | 5 ++-- drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +-- drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++--- .../net/ethernet/intel/i40e/i40e_ethtool.c | 6 ++--- drivers/net/ethernet/intel/i40e/i40e_main.c | 16 ++++++------ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- .../net/ethernet/intel/iavf/iavf_ethtool.c | 6 ++--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 ++--- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/intel/igbvf/ethtool.c | 4 +-- drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 +-- .../net/ethernet/intel/ixgb/ixgb_ethtool.c | 5 ++-- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 ++--- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +-- drivers/net/ethernet/jme.c | 6 ++--- drivers/net/ethernet/korina.c | 6 ++--- drivers/net/ethernet/lantiq_etop.c | 6 ++--- drivers/net/ethernet/marvell/mv643xx_eth.c | 8 +++--- drivers/net/ethernet/marvell/mvneta.c | 7 +++--- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 7 +++--- .../marvell/octeontx2/nic/otx2_ethtool.c | 8 +++--- .../marvell/prestera/prestera_ethtool.c | 4 +-- drivers/net/ethernet/marvell/pxa168_eth.c | 8 +++--- drivers/net/ethernet/marvell/skge.c | 6 ++--- drivers/net/ethernet/marvell/sky2.c | 6 ++--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 +++-- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- .../net/ethernet/mellanox/mlx4/en_ethtool.c | 7 +++--- drivers/net/ethernet/mellanox/mlx4/fw.c | 3 ++- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +++--- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 6 ++--- .../mellanox/mlx5/core/ipoib/ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 +-- .../mellanox/mlxsw/spectrum_ethtool.c | 6 ++--- .../net/ethernet/mellanox/mlxsw/switchx2.c | 7 +++--- drivers/net/ethernet/micrel/ks8851_common.c | 6 ++--- drivers/net/ethernet/micrel/ksz884x.c | 6 ++--- drivers/net/ethernet/microchip/enc28j60.c | 8 +++--- drivers/net/ethernet/microchip/encx24j600.c | 6 ++--- .../net/ethernet/microchip/lan743x_ethtool.c | 6 ++--- .../net/ethernet/myricom/myri10ge/myri10ge.c | 8 +++--- drivers/net/ethernet/natsemi/natsemi.c | 6 ++--- drivers/net/ethernet/natsemi/ns83820.c | 7 +++--- drivers/net/ethernet/neterion/s2io.c | 6 ++--- .../net/ethernet/neterion/vxge/vxge-ethtool.c | 8 +++--- .../net/ethernet/neterion/vxge/vxge-main.c | 2 +- .../ethernet/netronome/nfp/nfp_net_ethtool.c | 6 ++--- drivers/net/ethernet/ni/nixge.c | 4 +-- drivers/net/ethernet/nvidia/forcedeth.c | 6 ++--- drivers/net/ethernet/nxp/lpc_eth.c | 6 ++--- .../oki-semi/pch_gbe/pch_gbe_ethtool.c | 7 +++--- drivers/net/ethernet/packetengines/hamachi.c | 6 ++--- .../net/ethernet/packetengines/yellowfin.c | 6 ++--- .../ethernet/pensando/ionic/ionic_ethtool.c | 6 ++--- .../net/ethernet/pensando/ionic/ionic_lif.c | 2 +- .../qlogic/netxen/netxen_nic_ethtool.c | 6 ++--- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- .../net/ethernet/qlogic/qede/qede_ethtool.c | 4 +-- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/qlogic/qla3xxx.c | 6 ++--- .../ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 ++--- .../net/ethernet/qualcomm/emac/emac-ethtool.c | 2 +- drivers/net/ethernet/qualcomm/qca_debug.c | 8 +++--- drivers/net/ethernet/rdc/r6040.c | 6 ++--- drivers/net/ethernet/realtek/8139cp.c | 6 ++--- drivers/net/ethernet/realtek/8139too.c | 6 ++--- drivers/net/ethernet/realtek/r8169_main.c | 8 +++--- drivers/net/ethernet/rocker/rocker_main.c | 4 +-- .../ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +-- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/efx_common.c | 2 +- drivers/net/ethernet/sfc/ethtool_common.c | 7 +++--- drivers/net/ethernet/sfc/falcon/efx.c | 4 +-- drivers/net/ethernet/sfc/falcon/ethtool.c | 9 ++++--- drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- drivers/net/ethernet/sfc/falcon/nic.c | 2 +- drivers/net/ethernet/sfc/mcdi_mon.c | 2 +- drivers/net/ethernet/sfc/nic.c | 2 +- drivers/net/ethernet/sgi/ioc3-eth.c | 6 ++--- drivers/net/ethernet/sis/sis190.c | 7 +++--- drivers/net/ethernet/sis/sis900.c | 6 ++--- drivers/net/ethernet/smsc/epic100.c | 6 ++--- drivers/net/ethernet/smsc/smc911x.c | 6 ++--- drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +-- drivers/net/ethernet/smsc/smc91x.c | 6 ++--- drivers/net/ethernet/smsc/smsc911x.c | 6 ++--- drivers/net/ethernet/smsc/smsc9420.c | 6 ++--- drivers/net/ethernet/socionext/netsec.c | 4 +-- drivers/net/ethernet/socionext/sni_ave.c | 4 +-- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 9 ++++--- drivers/net/ethernet/sun/cassini.c | 6 ++--- drivers/net/ethernet/sun/ldmvsw.c | 4 +-- drivers/net/ethernet/sun/niu.c | 8 +++--- drivers/net/ethernet/sun/sunbmac.c | 4 +-- drivers/net/ethernet/sun/sungem.c | 6 ++--- drivers/net/ethernet/sun/sunhme.c | 7 +++--- drivers/net/ethernet/sun/sunqe.c | 4 +-- drivers/net/ethernet/sun/sunvnet.c | 4 +-- .../net/ethernet/synopsys/dwc-xlgmac-common.c | 4 +-- .../ethernet/synopsys/dwc-xlgmac-ethtool.c | 6 ++--- drivers/net/ethernet/tehuti/tehuti.c | 8 +++--- drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +-- drivers/net/ethernet/ti/cpmac.c | 4 +-- drivers/net/ethernet/ti/cpsw.c | 6 ++--- drivers/net/ethernet/ti/cpsw_new.c | 6 ++--- drivers/net/ethernet/ti/davinci_emac.c | 4 +-- drivers/net/ethernet/ti/tlan.c | 8 +++--- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +-- .../net/ethernet/toshiba/spider_net_ethtool.c | 8 +++--- drivers/net/ethernet/toshiba/tc35815.c | 6 ++--- drivers/net/ethernet/via/via-rhine.c | 4 +-- drivers/net/ethernet/via/via-velocity.c | 10 ++++---- drivers/net/ethernet/wiznet/w5100.c | 6 ++--- drivers/net/ethernet/wiznet/w5300.c | 6 ++--- .../net/ethernet/xilinx/xilinx_axienet_main.c | 4 +-- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 +-- drivers/net/fjes/fjes_ethtool.c | 6 ++--- drivers/net/geneve.c | 4 +-- drivers/net/hyperv/netvsc_drv.c | 4 +-- drivers/net/ipvlan/ipvlan_main.c | 4 +-- drivers/net/macvlan.c | 4 +-- drivers/net/net_failover.c | 4 +-- drivers/net/netconsole.c | 10 ++++---- drivers/net/ntb_netdev.c | 6 ++--- drivers/net/phy/adin.c | 4 +-- drivers/net/phy/bcm-phy-lib.c | 4 +-- drivers/net/phy/marvell.c | 2 +- drivers/net/phy/micrel.c | 4 +-- drivers/net/phy/mscc/mscc_main.c | 4 +-- drivers/net/phy/phy_device.c | 2 +- drivers/net/rionet.c | 8 +++--- drivers/net/team/team.c | 4 +-- drivers/net/tun.c | 8 +++--- drivers/net/usb/aqc111.c | 2 +- drivers/net/usb/asix_common.c | 4 +-- drivers/net/usb/catc.c | 4 +-- drivers/net/usb/pegasus.c | 4 +-- drivers/net/usb/r8152.c | 8 +++--- drivers/net/usb/rtl8150.c | 4 +-- drivers/net/usb/sierra_net.c | 4 +-- drivers/net/usb/usbnet.c | 4 +-- drivers/net/veth.c | 4 +-- drivers/net/virtio_net.c | 6 ++--- drivers/net/vmxnet3/vmxnet3_ethtool.c | 6 ++--- drivers/net/vrf.c | 4 +-- drivers/net/vxlan.c | 4 +-- drivers/net/wimax/i2400m/netdev.c | 8 +++--- drivers/net/wimax/i2400m/usb.c | 4 +-- drivers/net/wireless/ath/ath10k/coredump.c | 6 ++--- drivers/net/wireless/ath/ath10k/qmi.c | 5 ++-- drivers/net/wireless/ath/ath11k/qmi.c | 6 ++--- drivers/net/wireless/ath/ath6kl/init.c | 4 +-- drivers/net/wireless/ath/carl9170/fw.c | 2 +- drivers/net/wireless/ath/wil6210/main.c | 2 +- drivers/net/wireless/ath/wil6210/netdev.c | 2 +- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- drivers/net/wireless/atmel/atmel.c | 3 ++- drivers/net/wireless/broadcom/b43/leds.c | 2 +- .../net/wireless/broadcom/b43legacy/leds.c | 2 +- .../broadcom/brcm80211/brcmfmac/common.c | 8 +++--- .../broadcom/brcm80211/brcmfmac/core.c | 8 +++--- .../broadcom/brcm80211/brcmfmac/firmware.c | 5 ++-- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 ++--- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 7 +++--- .../net/wireless/intel/iwlegacy/3945-mac.c | 2 +- .../wireless/intersil/hostap/hostap_ioctl.c | 2 +- .../wireless/intersil/prism54/islpci_dev.c | 4 +-- .../net/wireless/marvell/libertas/ethtool.c | 4 +-- drivers/net/wireless/marvell/mwifiex/main.c | 3 +-- .../mediatek/mt76/mt7615/mt7615_trace.h | 2 +- .../wireless/mediatek/mt76/mt76x02_trace.h | 2 +- drivers/net/wireless/mediatek/mt76/trace.h | 2 +- .../net/wireless/mediatek/mt76/usb_trace.h | 2 +- drivers/net/wireless/mediatek/mt7601u/trace.h | 2 +- drivers/net/wireless/microchip/wilc1000/mon.c | 2 +- .../net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- .../net/wireless/quantenna/qtnfmac/commands.c | 2 +- .../wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- drivers/net/wireless/wl3501_cs.c | 8 +++--- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/fabrics.c | 2 +- drivers/nvme/target/admin-cmd.c | 2 +- drivers/nvme/target/discovery.c | 2 +- drivers/of/base.c | 2 +- drivers/of/fdt.c | 6 ++--- drivers/of/unittest.c | 2 +- drivers/parisc/led.c | 2 +- drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- drivers/platform/x86/i2c-multi-instantiate.c | 2 +- .../platform/x86/intel_cht_int33fe_typec.c | 6 ++--- drivers/platform/x86/surface3_power.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 5 ++-- drivers/remoteproc/qcom_sysmon.c | 2 +- drivers/rpmsg/qcom_glink_ssr.c | 2 +- drivers/s390/block/dasd_devmap.c | 2 +- drivers/s390/block/dasd_eer.c | 4 +-- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/char/hmcdrv_cache.c | 2 +- drivers/s390/char/tape_class.c | 4 +-- drivers/s390/cio/qdio_debug.c | 2 +- drivers/s390/net/ctcm_main.c | 2 +- drivers/s390/net/fsm.c | 2 +- drivers/s390/net/qeth_ethtool.c | 4 +-- drivers/s390/scsi/zfcp_aux.c | 2 +- drivers/s390/scsi/zfcp_fc.c | 2 +- drivers/scsi/3w-9xxx.c | 2 +- drivers/scsi/aacraid/aachba.c | 4 +-- drivers/scsi/bfa/bfa_fcbuild.c | 4 +-- drivers/scsi/bfa/bfa_fcs.c | 6 ++--- drivers/scsi/bfa/bfa_fcs_lport.c | 25 +++++++++---------- drivers/scsi/bfa/bfa_ioc.c | 2 +- drivers/scsi/bfa/bfa_svc.c | 2 +- drivers/scsi/bfa/bfad.c | 10 ++++---- drivers/scsi/bfa/bfad_attr.c | 4 +-- drivers/scsi/bfa/bfad_bsg.c | 6 ++--- drivers/scsi/bfa/bfad_im.c | 2 +- drivers/scsi/bnx2i/bnx2i_init.c | 2 +- drivers/scsi/fcoe/fcoe_transport.c | 2 +- drivers/scsi/gdth.c | 6 ++--- drivers/scsi/ibmvscsi/ibmvscsi.c | 8 +++--- drivers/scsi/lpfc/lpfc_attr.c | 6 ++--- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/ncr53c8xx.c | 2 +- drivers/scsi/qedi/qedi_main.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 16 ++++++------ drivers/scsi/qla2xxx/qla_mr.c | 20 +++++++-------- drivers/scsi/qla4xxx/ql4_mbx.c | 8 +++--- drivers/scsi/qla4xxx/ql4_os.c | 14 +++++------ drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/scsi/ufs/ufs-qcom.c | 2 +- drivers/soc/fsl/qe/qe.c | 5 ++-- drivers/soc/qcom/smp2p.c | 2 +- drivers/spi/spi.c | 4 +-- drivers/staging/comedi/comedi_fops.c | 4 +-- .../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/qlge/qlge_ethtool.c | 6 ++--- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- .../staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 ++--- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- drivers/staging/sm750fb/sm750.c | 2 +- .../target/iscsi/iscsi_target_parameters.c | 4 +-- drivers/target/iscsi/iscsi_target_util.c | 12 ++++----- drivers/target/target_core_configfs.c | 11 ++++---- drivers/target/target_core_device.c | 6 ++--- drivers/target/target_core_user.c | 4 +-- drivers/thermal/thermal_core.c | 4 +-- drivers/thermal/thermal_hwmon.c | 2 +- drivers/tty/hvc/hvcs.c | 2 +- drivers/tty/serial/earlycon.c | 6 ++--- drivers/tty/serial/serial_core.c | 2 +- drivers/tty/serial/sunsu.c | 6 ++--- drivers/tty/serial/sunzilog.c | 9 +++---- drivers/usb/atm/usbatm.c | 2 +- drivers/usb/core/devio.c | 3 +-- drivers/usb/gadget/function/f_fs.c | 2 +- drivers/usb/gadget/function/f_uvc.c | 2 +- drivers/usb/gadget/function/u_audio.c | 6 ++--- drivers/usb/gadget/function/u_ether.c | 8 +++--- drivers/usb/gadget/function/uvc_v4l2.c | 6 ++--- drivers/usb/gadget/udc/omap_udc.c | 2 +- drivers/usb/misc/usb251xb.c | 6 ++--- drivers/usb/storage/onetouch.c | 2 +- drivers/usb/typec/tcpm/fusb302.c | 2 +- drivers/usb/usbip/stub_main.c | 2 +- drivers/video/console/sticore.c | 2 +- drivers/video/fbdev/aty/atyfb_base.c | 2 +- drivers/video/fbdev/aty/radeon_base.c | 2 +- drivers/video/fbdev/bw2.c | 2 +- drivers/video/fbdev/cirrusfb.c | 2 +- drivers/video/fbdev/clps711x-fb.c | 2 +- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/cyber2000fb.c | 8 +++--- drivers/video/fbdev/ffb.c | 2 +- drivers/video/fbdev/geode/gx1fb_core.c | 8 +++--- drivers/video/fbdev/gxt4500.c | 2 +- drivers/video/fbdev/i740fb.c | 2 +- drivers/video/fbdev/imxfb.c | 2 +- drivers/video/fbdev/matrox/matroxfb_base.c | 7 +++--- .../video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- drivers/video/fbdev/pxa168fb.c | 2 +- drivers/video/fbdev/pxafb.c | 2 +- drivers/video/fbdev/s3fb.c | 2 +- drivers/video/fbdev/simplefb.c | 2 +- drivers/video/fbdev/sis/sis_main.c | 4 +-- drivers/video/fbdev/sm501fb.c | 2 +- drivers/video/fbdev/sstfb.c | 2 +- drivers/video/fbdev/sunxvr1000.c | 2 +- drivers/video/fbdev/sunxvr2500.c | 2 +- drivers/video/fbdev/sunxvr500.c | 2 +- drivers/video/fbdev/tcx.c | 2 +- drivers/video/fbdev/tdfxfb.c | 4 +-- drivers/video/fbdev/tgafb.c | 2 +- drivers/video/fbdev/tridentfb.c | 2 +- drivers/virt/vboxguest/vboxguest_core.c | 3 +-- drivers/w1/masters/sgi_w1.c | 2 +- drivers/xen/xen-scsiback.c | 2 +- drivers/xen/xenbus/xenbus_probe_frontend.c | 2 +- fs/9p/vfs_inode.c | 4 +-- fs/affs/super.c | 2 +- fs/befs/btree.c | 2 +- fs/befs/linuxvfs.c | 2 +- fs/btrfs/check-integrity.c | 2 +- fs/char_dev.c | 2 +- fs/cifs/cifs_unicode.c | 2 +- fs/cifs/cifsroot.c | 2 +- fs/cifs/connect.c | 2 +- fs/cifs/smb2pdu.c | 2 +- fs/dlm/config.c | 6 ++--- fs/exec.c | 2 +- fs/ext4/file.c | 2 +- fs/gfs2/ops_fstype.c | 10 ++++---- fs/hostfs/hostfs_kern.c | 2 +- fs/lockd/host.c | 2 +- fs/nfs/nfs4client.c | 2 +- fs/nfs/nfsroot.c | 4 +-- fs/nfsd/nfs4idmap.c | 8 +++--- fs/nfsd/nfssvc.c | 3 +-- fs/ocfs2/dlmfs/dlmfs.c | 2 +- fs/ocfs2/stackglue.c | 4 +-- fs/ocfs2/super.c | 10 ++++---- fs/proc/kcore.c | 2 +- fs/reiserfs/procfs.c | 4 +-- fs/super.c | 4 +-- fs/vboxsf/super.c | 2 +- include/linux/gameport.h | 2 +- include/linux/suspend.h | 2 +- include/rdma/rdma_vt.h | 2 +- include/trace/events/kyber.h | 8 +++--- include/trace/events/task.h | 2 +- include/trace/events/wbt.h | 8 +++--- init/do_mounts.c | 2 +- init/main.c | 4 +-- kernel/acct.c | 2 +- kernel/cgroup/cgroup-v1.c | 4 +-- kernel/events/core.c | 6 ++--- kernel/kallsyms.c | 4 +-- kernel/kprobes.c | 2 +- kernel/module.c | 13 +++++----- kernel/params.c | 2 +- kernel/printk/printk.c | 2 +- kernel/relay.c | 4 +-- kernel/sched/fair.c | 6 ++--- kernel/time/clocksource.c | 2 +- kernel/trace/ftrace.c | 19 +++++++------- kernel/trace/trace.c | 8 +++--- kernel/trace/trace_boot.c | 8 +++--- kernel/trace/trace_events.c | 2 +- kernel/trace/trace_events_inject.c | 6 +++-- kernel/trace/trace_kprobe.c | 2 +- kernel/trace/trace_probe.c | 2 +- lib/dynamic_debug.c | 2 +- lib/earlycpio.c | 2 +- mm/dmapool.c | 2 +- mm/kasan/report.c | 2 +- mm/zswap.c | 2 +- net/8021q/vlan_dev.c | 6 ++--- net/ax25/af_ax25.c | 2 +- net/bluetooth/hidp/core.c | 6 ++--- net/bridge/br_device.c | 8 +++--- net/bridge/br_sysfs_if.c | 4 +-- net/bridge/netfilter/ebtables.c | 2 +- net/caif/caif_dev.c | 3 +-- net/caif/caif_usb.c | 2 +- net/caif/cfcnfg.c | 4 +-- net/caif/cfctrl.c | 2 +- net/core/dev.c | 6 ++--- net/core/drop_monitor.c | 2 +- net/core/netpoll.c | 4 +-- net/dsa/master.c | 2 +- net/dsa/slave.c | 6 ++--- net/ethtool/ioctl.c | 6 ++--- net/ieee802154/trace.h | 2 +- net/ipv4/arp.c | 2 +- net/ipv4/ip_tunnel.c | 4 +-- net/ipv4/ipconfig.c | 10 ++++---- net/ipv6/ip6_gre.c | 2 +- net/ipv6/ip6_tunnel.c | 2 +- net/ipv6/ip6_vti.c | 2 +- net/ipv6/sit.c | 2 +- net/l2tp/l2tp_eth.c | 4 +-- net/mac80211/iface.c | 2 +- net/mac80211/trace.h | 2 +- net/mac802154/trace.h | 2 +- net/netfilter/ipset/ip_set_core.c | 4 +-- net/netfilter/ipset/ip_set_hash_netiface.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 8 +++--- net/netfilter/nf_log.c | 4 +-- net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nft_osf.c | 2 +- net/netfilter/x_tables.c | 20 +++++++-------- net/netfilter/xt_RATEEST.c | 2 +- net/openvswitch/vport-internal_dev.c | 2 +- net/packet/af_packet.c | 4 +-- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- net/sched/sch_teql.c | 2 +- net/sunrpc/svc.c | 8 +++--- net/sunrpc/xprtsock.c | 2 +- net/wireless/ethtool.c | 12 ++++----- net/wireless/trace.h | 2 +- samples/trace_events/trace-events-sample.h | 2 +- samples/v4l/v4l2-pci-skeleton.c | 10 ++++---- security/integrity/ima/ima_api.c | 2 +- security/keys/request_key_auth.c | 2 +- sound/aoa/codecs/onyx.c | 2 +- sound/aoa/codecs/tas.c | 2 +- sound/aoa/codecs/toonie.c | 2 +- sound/aoa/core/alsa.c | 9 ++++--- sound/aoa/fabrics/layout.c | 8 +++--- sound/aoa/soundbus/sysfs.c | 2 +- sound/arm/aaci.c | 7 +++--- sound/arm/pxa2xx-ac97.c | 2 +- sound/core/compress_offload.c | 2 +- sound/core/control.c | 16 ++++++------ sound/core/ctljack.c | 2 +- sound/core/hwdep.c | 6 ++--- sound/core/init.c | 4 +-- sound/core/oss/mixer_oss.c | 19 +++++++++----- sound/core/pcm.c | 2 +- sound/core/pcm_native.c | 6 ++--- sound/core/rawmidi.c | 2 +- sound/core/seq/oss/seq_oss_midi.c | 4 +-- sound/core/seq/oss/seq_oss_synth.c | 6 ++--- sound/core/seq/seq_clientmgr.c | 2 +- sound/core/seq/seq_ports.c | 6 ++--- sound/core/timer.c | 10 ++++---- sound/core/timer_compat.c | 4 +-- sound/drivers/opl3/opl3_oss.c | 2 +- sound/drivers/opl3/opl3_synth.c | 2 +- sound/firewire/bebob/bebob_hwdep.c | 2 +- sound/firewire/dice/dice-hwdep.c | 2 +- sound/firewire/digi00x/digi00x-hwdep.c | 2 +- sound/firewire/fireface/ff-hwdep.c | 2 +- sound/firewire/fireworks/fireworks_hwdep.c | 2 +- sound/firewire/motu/motu-hwdep.c | 2 +- sound/firewire/oxfw/oxfw-hwdep.c | 2 +- sound/firewire/tascam/tascam-hwdep.c | 2 +- sound/i2c/i2c.c | 4 +-- sound/isa/ad1848/ad1848.c | 4 +-- sound/isa/cs423x/cs4231.c | 4 +-- sound/isa/cs423x/cs4236.c | 4 +-- sound/isa/es1688/es1688.c | 4 +-- sound/isa/sb/sb16_csp.c | 3 ++- sound/isa/sb/sb_mixer.c | 2 +- sound/oss/dmasound/dmasound_core.c | 4 +-- sound/pci/cs5535audio/cs5535audio_olpc.c | 4 +-- sound/pci/ctxfi/ctpcm.c | 2 +- sound/pci/emu10k1/emu10k1.c | 4 +-- sound/pci/emu10k1/emu10k1_main.c | 2 +- sound/pci/emu10k1/emufx.c | 7 +++--- sound/pci/es1968.c | 2 +- sound/pci/fm801.c | 2 +- sound/pci/hda/hda_auto_parser.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_controller.c | 2 +- sound/pci/hda/hda_eld.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/hda_jack.c | 2 +- sound/pci/ice1712/juli.c | 2 +- sound/pci/ice1712/psc724.c | 8 +++--- sound/pci/ice1712/quartet.c | 2 +- sound/pci/ice1712/wm8776.c | 2 +- sound/pci/lola/lola.c | 2 +- sound/pci/lola/lola_pcm.c | 2 +- sound/pci/rme9652/hdspm.c | 4 +-- sound/ppc/keywest.c | 2 +- sound/soc/qcom/qdsp6/q6afe.c | 4 +-- sound/soc/sh/rcar/core.c | 2 +- sound/usb/bcd2000/bcd2000.c | 2 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/device.c | 6 ++--- sound/usb/caiaq/midi.c | 2 +- sound/usb/card.c | 4 +-- sound/usb/hiface/chip.c | 8 +++--- sound/usb/hiface/pcm.c | 2 +- sound/usb/mixer.c | 19 ++++++++------ sound/usb/mixer_quirks.c | 3 ++- sound/usb/mixer_scarlett.c | 2 +- sound/usb/mixer_scarlett_gen2.c | 2 +- sound/usb/mixer_us16x08.c | 2 +- sound/x86/intel_hdmi_audio.c | 2 +- sound/xen/xen_snd_front_cfg.c | 2 +- tools/perf/arch/x86/util/event.c | 2 +- tools/perf/arch/x86/util/machine.c | 2 +- tools/perf/builtin-buildid-cache.c | 6 ++--- tools/perf/jvmti/libjvmti.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/util/annotate.c | 2 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/dso.c | 2 +- .../util/intel-pt-decoder/intel-pt-decoder.c | 2 +- tools/perf/util/llvm-utils.c | 4 +-- tools/perf/util/machine.c | 6 ++--- tools/perf/util/parse-events.c | 2 +- tools/perf/util/probe-file.c | 2 +- tools/perf/util/svghelper.c | 2 +- tools/perf/util/symbol.c | 2 +- tools/perf/util/synthetic-events.c | 4 +-- 910 files changed, 1773 insertions(+), 1741 deletions(-)
arch/alpha/kernel/setup.c +3 -2
@@ -499,9 +499,10 @@ setup_arch(char **cmdline_p)boot flags depending on the boot mode, we need some shorthand. This should do for installation. */ if (strcmp (COMMAND_LINE ,"INSTALL" ) ==0 ) { -strlcpy (command_line,"root=/dev/fd0 load_ramdisk=1" ,sizeof command_line); +strscpy (command_line,"root=/dev/fd0 load_ramdisk=1" , +sizeof command_line); }else { -strlcpy (command_line,COMMAND_LINE ,sizeof command_line); +strscpy (command_line,COMMAND_LINE ,sizeof command_line); }strcpy (boot_command_line, command_line); *cmdline_p = command_line;
arch/arm/kernel/atags_parse.c +2 -2
@@ -127,7 +127,7 @@ static int __init parse_tag_cmdline(const struct tag *tag)#elif defined(CONFIG_CMDLINE_FORCE )pr_warn ("Ignoring tag cmdline (using the default kernel command line)\n" );#else -strlcpy (default_command_line, tag->u.cmdline.cmdline, +strscpy (default_command_line, tag->u.cmdline.cmdline,COMMAND_LINE_SIZE );#endif return 0 ;
@@ -224,7 +224,7 @@ setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr) }/* parse_early_param needs a boot_command_line */ -strlcpy (boot_command_line, from,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, from,COMMAND_LINE_SIZE );return mdesc; }
arch/arm/kernel/setup.c +1 -1
@@ -1110,7 +1110,7 @@ void __init setup_arch(char **cmdline_p) init_mm.brk = (unsigned long ) _end;/* populate cmd_line too for later use, preserving boot_command_line */ -strlcpy (cmd_line, boot_command_line,COMMAND_LINE_SIZE ); +strscpy (cmd_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = cmd_line;early_fixmap_init ();
arch/arm/kernel/vdso.c +1 -1
@@ -144,7 +144,7 @@ static Elf32_Sym * __init find_symbol(struct elfinfo *lib, const char *symname)if (lib->dynsym[i].st_name ==0 )continue ; -strlcpy (name, lib->dynstr + lib->dynsym[i].st_name, +strscpy (name, lib->dynstr + lib->dynsym[i].st_name,MAX_SYMNAME ); c =strchr (name,'@' );if (c)
arch/arm/mach-s3c/mach-mini2440.c +1 -1
@@ -620,7 +620,7 @@ static char mini2440_features_str[12] __initdata = "0tb";static int __init mini2440_features_setup (char *str) {if (str) -strlcpy (mini2440_features_str, str, +strscpy (mini2440_features_str, str,sizeof (mini2440_features_str));return 1 ; }
arch/arm/mach-s3c/mach-mini6410.c +1 -1
@@ -262,7 +262,7 @@ static char mini6410_features_str[12] __initdata = "0";static int __init mini6410_features_setup (char *str) {if (str) -strlcpy (mini6410_features_str, str, +strscpy (mini6410_features_str, str,sizeof (mini6410_features_str));return 1 ; }
arch/arm/mach-s3c/mach-real6410.c +1 -1
@@ -232,7 +232,7 @@ static char real6410_features_str[12] __initdata = "0";static int __init real6410_features_setup (char *str) {if (str) -strlcpy (real6410_features_str, str, +strscpy (real6410_features_str, str,sizeof (real6410_features_str));return 1 ; }
arch/hexagon/kernel/setup.c +3 -3
@@ -66,9 +66,9 @@ void __init setup_arch(char **cmdline_p) on_simulator =0 ;if (p[0 ] !='\0' ) -strlcpy (boot_command_line, p,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, p,COMMAND_LINE_SIZE );else -strlcpy (boot_command_line, default_command_line, +strscpy (boot_command_line, default_command_line,COMMAND_LINE_SIZE );/*
@@ -76,7 +76,7 @@ void __init setup_arch(char **cmdline_p)* are both picked up by the init code. If no reason to * make them different, pass the same pointer back. */ -strlcpy (cmd_line, boot_command_line,COMMAND_LINE_SIZE ); +strscpy (cmd_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = cmd_line;parse_early_param ();
arch/ia64/kernel/setup.c +1 -1
@@ -556,7 +556,7 @@ setup_arch (char **cmdline_p)ia64_patch_vtop ((u64 ) __start___vtop_patchlist, (u64 ) __end___vtop_patchlist); *cmdline_p =__va (ia64_boot_param->command_line); -strlcpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE );efi_init ();io_port_init ();
arch/m68k/kernel/setup_mm.c +1 -1
@@ -181,7 +181,7 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)break ;case BI_COMMAND_LINE : -strlcpy (m68k_command_line, data, +strscpy (m68k_command_line, data,sizeof (m68k_command_line));break ;
arch/microblaze/kernel/prom.c +1 -1
@@ -20,7 +20,7 @@ void __init early_init_devtree(void *params)early_init_dt_scan (params);if (!strlen (boot_command_line)) -strlcpy (boot_command_line, cmd_line,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, cmd_line,COMMAND_LINE_SIZE );memblock_allow_resize ();
arch/mips/bcm47xx/board.c +1 -1
@@ -345,7 +345,7 @@ void __init bcm47xx_board_detect(void) board_detected =bcm47xx_board_get_nvram (); bcm47xx_board.board = board_detected->board; -strlcpy (bcm47xx_board.name, board_detected->name, +strscpy (bcm47xx_board.name, board_detected->name,BCM47XX_BOARD_MAX_NAME ); }
arch/mips/kernel/prom.c +3 -3
@@ -26,7 +26,7 @@ __init void mips_set_machine_name(const char *name)if (name ==NULL )return ; -strlcpy (mips_machine_name, name,sizeof (mips_machine_name)); +strscpy (mips_machine_name, name,sizeof (mips_machine_name));pr_info ("MIPS: machine is %s\n" ,mips_get_machine_name ()); }
@@ -52,9 +52,9 @@ int __init __dt_register_buses(const char *bus0, const char *bus1)if (!of_have_populated_dt ())panic ("device tree not present" ); -strlcpy (of_ids[0 ].compatible, bus0,sizeof (of_ids[0 ].compatible)); +strscpy (of_ids->compatible, bus0,sizeof (of_ids[0 ].compatible));if (bus1) { -strlcpy (of_ids[1 ].compatible, bus1, +strscpy (of_ids->compatible, bus1,sizeof (of_ids[1 ].compatible)); }
arch/mips/kernel/relocate.c +1 -1
@@ -313,7 +313,7 @@ void *__init relocate_kernel(void)early_init_dt_scan (fdt);if (boot_command_line[0 ]) {/* Boot command line was passed in device tree */ -strlcpy (arcs_cmdline, boot_command_line,COMMAND_LINE_SIZE ); +strscpy (arcs_cmdline, boot_command_line,COMMAND_LINE_SIZE ); }#endif /* CONFIG_USE_OF */
arch/mips/kernel/setup.c +3 -3
@@ -552,7 +552,7 @@ static void __init bootcmdline_init(void)* unmodified. */ if (IS_ENABLED (CONFIG_CMDLINE_OVERRIDE )) { -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE );return ; }
@@ -564,7 +564,7 @@ static void __init bootcmdline_init(void)* boot_command_line to undo anything early_init_dt_scan_chosen() did. */ if (IS_ENABLED (CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND )) -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE );else boot_command_line[0 ] =0 ;
@@ -626,7 +626,7 @@ static void __init arch_mem_init(char **cmdline_p)memblock_set_bottom_up (true);bootcmdline_init (); -strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); +strscpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line;parse_early_param ();
arch/mips/pic32/pic32mzda/init.c +1 -1
@@ -57,7 +57,7 @@ void __init plat_mem_setup(void)pr_info (" builtin_cmdline : %s\n" ,CONFIG_CMDLINE );#endif if (dtb != __dtb_start) -strlcpy (arcs_cmdline, boot_command_line,COMMAND_LINE_SIZE ); +strscpy (arcs_cmdline, boot_command_line,COMMAND_LINE_SIZE );#ifdef CONFIG_EARLY_PRINTK fw_init_early_console (-1 );
arch/nios2/kernel/cpuinfo.c +1 -1
@@ -47,7 +47,7 @@ void __init setup_cpuinfo(void) str =of_get_property (cpu,"altr,implementation" , &len);if (str) -strlcpy (cpuinfo.cpu_impl, str,sizeof (cpuinfo.cpu_impl)); +strscpy (cpuinfo.cpu_impl, str,sizeof (cpuinfo.cpu_impl));else strcpy (cpuinfo.cpu_impl,"<unknown>" );
arch/nios2/kernel/setup.c +3 -3
@@ -123,7 +123,7 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6, dtb_passed = r6;if (r7) - strlcpy(cmdline_passed, (char *)r7, COMMAND_LINE_SIZE); + strscpy(cmdline_passed, (char *)r7, COMMAND_LINE_SIZE); }#endif
@@ -131,10 +131,10 @@ asmlinkage void __init nios2_boot_init(unsigned r4, unsigned r5, unsigned r6,#ifndef CONFIG_CMDLINE_FORCE if (cmdline_passed[0 ]) -strlcpy (boot_command_line, cmdline_passed,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, cmdline_passed,COMMAND_LINE_SIZE );#ifdef CONFIG_NIOS2_CMDLINE_IGNORE_DTB else -strlcpy (boot_command_line ,CONFIG_CMDLINE ,COMMAND_LINE_SIZE ); +strscpy (boot_command_line ,CONFIG_CMDLINE ,COMMAND_LINE_SIZE );#endif #endif
arch/parisc/kernel/drivers.c +1 -1
@@ -537,7 +537,7 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) dev->hpa.flags =IORESOURCE_MEM ; name =parisc_hardware_description (&dev->id);if (name) { -strlcpy (dev->name, name,sizeof (dev->name)); +strscpy (dev->name, name,sizeof (dev->name)); }/* Silently fail things like mouse ports which are subsumed within
arch/parisc/kernel/setup.c +1 -1
@@ -56,7 +56,7 @@ void __init setup_cmdline(char **cmdline_p)/* called from hpux boot loader */ boot_command_line[0 ] ='\0' ; }else { -strlcpy (boot_command_line, (char *)__va (boot_args[1 ]), +strscpy (boot_command_line, (char *)__va (boot_args[1 ]),COMMAND_LINE_SIZE );#ifdef CONFIG_BLK_DEV_INITRD
arch/powerpc/kernel/dt_cpu_ftrs.c +1 -1
@@ -1116,7 +1116,7 @@ static int __init dt_cpu_ftrs_scan_callback(unsigned long node, const char prop =of_get_flat_dt_prop (node,"display-name" ,NULL );if (prop &&strlen ((char *)prop) !=0 ) { -strlcpy (dt_cpu_name, (char *)prop,sizeof (dt_cpu_name)); +strscpy (dt_cpu_name, (char *)prop,sizeof (dt_cpu_name)); cur_cpu_spec->cpu_name = dt_cpu_name; }
arch/powerpc/kernel/vdso.c +2 -2
@@ -260,7 +260,7 @@ static Elf32_Sym * __init find_symbol32(struct lib32_elfinfo *lib,for (i =0 ; i < (lib->dynsymsize /sizeof (Elf32_Sym)); i++) {if (lib->dynsym[i].st_name ==0 )continue ; -strlcpy (name, lib->dynstr + lib->dynsym[i].st_name, +strscpy (name, lib->dynstr + lib->dynsym[i].st_name,MAX_SYMNAME ); c =strchr (name,'@' );if (c)
@@ -366,7 +366,7 @@ static Elf64_Sym * __init find_symbol64(struct lib64_elfinfo *lib,for (i =0 ; i < (lib->dynsymsize /sizeof (Elf64_Sym)); i++) {if (lib->dynsym[i].st_name ==0 )continue ; -strlcpy (name, lib->dynstr + lib->dynsym[i].st_name, +strscpy (name, lib->dynstr + lib->dynsym[i].st_name,MAX_SYMNAME ); c =strchr (name,'@' );if (c)
arch/powerpc/platforms/pasemi/misc.c +1 -2
@@ -35,8 +35,7 @@ static int __init find_i2c_driver(struct device_node *node,for (i =0 ; i <ARRAY_SIZE (i2c_devices); i++) {if (!of_device_is_compatible (node, i2c_devices[i].of_device))continue ; -if (strlcpy (info->type, i2c_devices[i].i2c_type, -I2C_NAME_SIZE ) >=I2C_NAME_SIZE ) +if (strscpy (info->type, i2c_devices[i].i2c_type,I2C_NAME_SIZE ) >=I2C_NAME_SIZE )return -ENOMEM ;return 0 ; }
arch/powerpc/platforms/powermac/bootx_init.c +1 -1
@@ -243,7 +243,7 @@ static void __init bootx_scan_dt_build_strings(unsigned long base,DBG (" detected display ! adding properties names !\n" );bootx_dt_add_string ("linux,boot-display" , mem_end);bootx_dt_add_string ("linux,opened" , mem_end); -strlcpy (bootx_disp_path, namep,sizeof (bootx_disp_path)); +strscpy (bootx_disp_path, namep,sizeof (bootx_disp_path)); }/* get and store all property names */
arch/powerpc/platforms/powernv/idle.c +1 -1
@@ -1447,7 +1447,7 @@ static int pnv_parse_cpuidle_dt(void) goto out; }for (i =0 ; i < nr_idle_states; i++) -strlcpy (pnv_idle_states[i].name, temp_string[i], +strscpy (pnv_idle_states->name, temp_string[i],PNV_IDLE_NAME_LEN ); nr_pnv_idle_states = nr_idle_states; rc =0 ;
arch/powerpc/platforms/powernv/pci-ioda.c +1 -1
@@ -66,7 +66,7 @@ void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level, vaf.va = &args;if (pe->flags &PNV_IODA_PE_DEV ) -strlcpy (pfix,dev_name (&pe->pdev->dev),sizeof (pfix)); +strscpy (pfix,dev_name (&pe->pdev->dev),sizeof (pfix));else if (pe->flags & (PNV_IODA_PE_BUS |PNV_IODA_PE_BUS_ALL ))sprintf (pfix,"%04x:%02x " ,pci_domain_nr (pe->pbus), pe->pbus->number);
arch/powerpc/platforms/pseries/hvcserver.c +1 -1
@@ -176,7 +176,7 @@ int hvcs_get_partner_info(uint32_t unit_address, struct list_head *head, = (unsigned int)last_p_partition_ID;/* copy the Null-term char too */ -strlcpy (&next_partner_info->location_code[0 ], +strscpy (&next_partner_info->location_code[0 ], (char *)&pi_buff[2 ],sizeof (next_partner_info->location_code));
arch/riscv/kernel/setup.c +1 -1
@@ -59,7 +59,7 @@ static void __init parse_dtb(void)pr_err ("No DTB passed to the kernel\n" );#ifdef CONFIG_CMDLINE_FORCE -strlcpy (boot_command_line,CONFIG_CMDLINE ,COMMAND_LINE_SIZE ); +strscpy (boot_command_line,CONFIG_CMDLINE ,COMMAND_LINE_SIZE );pr_info ("Forcing kernel command line to: %s\n" , boot_command_line);#endif }
arch/s390/kernel/debug.c +1 -1
@@ -247,7 +247,7 @@ static debug_info_t *debug_info_alloc(const char *name, int pages_per_area, rc->level = level; rc->buf_size = buf_size; rc->entry_size =sizeof (debug_entry_t) + buf_size; -strlcpy (rc->name, name,sizeof (rc->name)); +strscpy (rc->name, name,sizeof (rc->name));memset (rc->views,0 ,DEBUG_MAX_VIEWS *sizeof (struct debug_view *));memset (rc->debugfs_entries,0 ,DEBUG_MAX_VIEWS *sizeof (struct dentry *));refcount_set (&(rc->ref_count),0 );
arch/s390/kernel/early.c +1 -1
@@ -278,7 +278,7 @@ char __bootdata(early_command_line)[COMMAND_LINE_SIZE];static void __init setup_boot_command_line (void ) {/* copy arch command line */ -strlcpy (boot_command_line, early_command_line,ARCH_COMMAND_LINE_SIZE ); +strscpy (boot_command_line, early_command_line,ARCH_COMMAND_LINE_SIZE ); }static void __init check_image_bootable (void )
arch/sh/drivers/dma/dma-api.c +1 -1
@@ -198,7 +198,7 @@ int request_dma(unsigned int chan, const char *dev_id)if (atomic_xchg (&channel->busy,1 ))return -EBUSY ; -strlcpy (channel->dev_id, dev_id,sizeof (channel->dev_id)); +strscpy (channel->dev_id, dev_id,sizeof (channel->dev_id));if (info->ops->request) { result = info->ops->request (channel);
arch/sh/kernel/setup.c +2 -2
@@ -307,9 +307,9 @@ void __init setup_arch(char **cmdline_p) bss_resource.end =virt_to_phys (__bss_stop)-1 ;#ifdef CONFIG_CMDLINE_OVERWRITE -strlcpy (command_line,CONFIG_CMDLINE ,sizeof (command_line)); +strscpy (command_line,CONFIG_CMDLINE ,sizeof (command_line));#else -strlcpy (command_line,COMMAND_LINE ,sizeof (command_line)); +strscpy (command_line,COMMAND_LINE ,sizeof (command_line));#ifdef CONFIG_CMDLINE_EXTEND strlcat (command_line," " ,sizeof (command_line));strlcat (command_line,CONFIG_CMDLINE ,sizeof (command_line));
arch/sparc/kernel/ioport.c +1 -1
@@ -202,7 +202,7 @@ static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys, tack +=sizeof (struct resource ); } -strlcpy (tack, name,XNMLN +1 ); +strscpy (tack, name,XNMLN +1 ); res->name = tack; va =_sparc_ioremap (res, busno, phys, size);
arch/sparc/kernel/setup_32.c +1 -1
@@ -303,7 +303,7 @@ void __init setup_arch(char **cmdline_p)/* Initialize PROM console and command line. */ *cmdline_p =prom_getbootargs (); -strlcpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE );parse_early_param ();boot_flags_init (*cmdline_p);
arch/sparc/kernel/setup_64.c +1 -1
@@ -638,7 +638,7 @@ void __init setup_arch(char **cmdline_p) {/* Initialize PROM console and command line. */ *cmdline_p =prom_getbootargs (); -strlcpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE );parse_early_param ();boot_flags_init (*cmdline_p);
arch/sparc/prom/bootstr_32.c +2 -1
@@ -52,7 +52,8 @@ prom_getbootargs(void)* V3 PROM cannot supply as with more than 128 bytes * of an argument. But a smart bootstrap loader can. */ -strlcpy (barg_buf, *romvec->pv_v2bootargs.bootargs,sizeof (barg_buf)); +strscpy (barg_buf, *romvec->pv_v2bootargs.bootargs, +sizeof (barg_buf));break ;default :break ;
arch/um/drivers/net_kern.c +1 -1
@@ -265,7 +265,7 @@ static void uml_net_poll_controller(struct net_device *dev)static void uml_net_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -strlcpy (info->driver,DRIVER_NAME ,sizeof (info->driver)); +strscpy (info->driver,DRIVER_NAME ,sizeof (info->driver)); }static const struct ethtool_ops uml_net_ethtool_ops = {
arch/um/drivers/vector_kern.c +1 -1
@@ -1379,7 +1379,7 @@ static void vector_net_poll_controller(struct net_device *dev)static void vector_net_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -strlcpy (info->driver,DRIVER_NAME ,sizeof (info->driver)); +strscpy (info->driver,DRIVER_NAME ,sizeof (info->driver)); } static int vector_net_load_bpf_flash(struct net_device *dev,
arch/um/kernel/um_arch.c +1 -1
@@ -347,7 +347,7 @@ void __init setup_arch(char **cmdline_p)read_initrd ();paging_init (); -strlcpy (boot_command_line, command_line,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line;setup_hostinfo (host_info,sizeof host_info); }
arch/um/os-Linux/drivers/tuntap_user.c +1 -1
@@ -146,7 +146,7 @@ static int tuntap_open(void *data) }memset (&ifr,0 ,sizeof (ifr)); ifr.ifr_flags =IFF_TAP |IFF_NO_PI ; -strlcpy (ifr.ifr_name, pri->dev_name,sizeof (ifr.ifr_name)); +strscpy (ifr.ifr_name, pri->dev_name,sizeof (ifr.ifr_name));if (ioctl (pri->fd,TUNSETIFF , &ifr) <0 ) { err = -errno; printk(UM_KERN_ERR "TUNSETIFF failed, errno = %d\n",
arch/um/os-Linux/umid.c +3 -3
@@ -40,7 +40,7 @@ static int __init make_uml_dir(void) __func__); goto err; } -strlcpy (dir, home,sizeof (dir)); +strscpy (dir, home,sizeof (dir)); uml_dir++; }strlcat (dir, uml_dir,sizeof (dir));
@@ -251,7 +251,7 @@ int __init set_umid(char *name)if (strlen (name) >UMID_LEN -1 )return -E2BIG ; -strlcpy (umid, name,sizeof (umid)); +strscpy (umid, name,sizeof (umid));return 0 ; }
@@ -270,7 +270,7 @@ static int __init make_umid(void)make_uml_dir ();if (*umid =='\0' ) { -strlcpy (tmp, uml_dir,sizeof (tmp)); +strscpy (tmp, uml_dir,sizeof (tmp));strlcat (tmp,"XXXXXX" ,sizeof (tmp)); fd =mkstemp (tmp);if (fd <0 ) {
arch/x86/kernel/setup.c +3 -3
@@ -891,18 +891,18 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_CMDLINE_BOOL #ifdef CONFIG_CMDLINE_OVERRIDE -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE );#else if (builtin_cmdline[0 ]) {/* append boot loader cmdline to builtin */ strlcat (builtin_cmdline," " ,COMMAND_LINE_SIZE );strlcat (builtin_cmdline, boot_command_line,COMMAND_LINE_SIZE ); -strlcpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, builtin_cmdline,COMMAND_LINE_SIZE ); }#endif #endif -strlcpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); +strscpy (command_line, boot_command_line,COMMAND_LINE_SIZE ); *cmdline_p = command_line;/*
arch/xtensa/kernel/setup.c +4 -4
@@ -139,7 +139,7 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);static int __init parse_tag_cmdline (const bp_tag_t * tag) { -strlcpy (command_line, (char *)(tag->data),COMMAND_LINE_SIZE ); +strscpy (command_line, (char *)(tag->data),COMMAND_LINE_SIZE );return 0 ; }
@@ -229,7 +229,7 @@ void __init early_init_devtree(void *params)of_scan_flat_dt (xtensa_dt_io_area,NULL );if (!command_line[0 ]) - strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE); + strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); }#endif /* CONFIG_OF */
@@ -259,7 +259,7 @@ void __init init_arch(bp_tag_t *bp_start)#ifdef CONFIG_CMDLINE_BOOL if (!command_line[0 ]) -strlcpy (command_line, default_command_line,COMMAND_LINE_SIZE ); +strscpy (command_line, default_command_line,COMMAND_LINE_SIZE );#endif /* Early hook for platforms */
@@ -331,7 +331,7 @@ void __init setup_arch(char **cmdline_p) *cmdline_p = command_line;platform_setup (cmdline_p); -strlcpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE ); +strscpy (boot_command_line, *cmdline_p,COMMAND_LINE_SIZE );/* Reserve some memory regions */
arch/xtensa/platforms/iss/network.c +2 -2
@@ -173,7 +173,7 @@ static int tuntap_open(struct iss_net_private *lp)memset (&ifr,0 ,sizeof (ifr)); ifr.ifr_flags =IFF_TAP |IFF_NO_PI ; -strlcpy (ifr.ifr_name, dev_name,sizeof (ifr.ifr_name)); +strscpy (ifr.ifr_name, dev_name,sizeof (ifr.ifr_name)); err =simc_ioctl (fd,TUNSETIFF , &ifr);if (err <0 ) {
@@ -248,7 +248,7 @@ static int tuntap_probe(struct iss_net_private *lp, int index, char *init)return 0 ; } -strlcpy (lp->tp.info.tuntap.dev_name, dev_name, +strscpy (lp->tp.info.tuntap.dev_name, dev_name,sizeof (lp->tp.info.tuntap.dev_name));setup_etheraddr (dev, mac_str);
block/elevator.c +1 -1
@@ -738,7 +738,7 @@ static int __elevator_change(struct request_queue *q, const char *name)return elevator_switch (q,NULL ); } -strlcpy (elevator_name, name,sizeof (elevator_name)); +strscpy (elevator_name, name,sizeof (elevator_name)); e =elevator_get (q,strstrip (elevator_name), true);if (!e)return -EINVAL ;
block/genhd.c +1 -1
@@ -473,7 +473,7 @@ int register_blkdev(unsigned int major, const char *name) } p->major = major; -strlcpy (p->name, name,sizeof (p->name)); +strscpy (p->name, name,sizeof (p->name)); p->next =NULL ; index =major_to_index (major);
crypto/api.c +1 -1
@@ -115,7 +115,7 @@ struct crypto_larval *crypto_larval_alloc(const char *name, u32 type, u32 mask) larval->alg.cra_priority =-1 ; larval->alg.cra_destroy = crypto_larval_destroy; -strlcpy (larval->alg.cra_name, name,CRYPTO_MAX_ALG_NAME ); +strscpy (larval->alg.cra_name, name,CRYPTO_MAX_ALG_NAME );init_completion (&larval->completion);return larval;
crypto/essiv.c +1 -1
@@ -542,7 +542,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb) }/* record the driver name so we can instantiate this exact algo later */ -strlcpy (ictx->shash_driver_name, hash_alg->base.cra_driver_name, +strscpy (ictx->shash_driver_name, hash_alg->base.cra_driver_name,CRYPTO_MAX_ALG_NAME );/* Instance fields */
drivers/acpi/bus.c +2 -2
@@ -681,7 +681,7 @@ static bool acpi_of_modalias(struct acpi_device *adev, str = obj->string.pointer; chr =strchr (str,',' ); -strlcpy (modalias, chr ? chr +1 : str, len); +strscpy (modalias, chr ? chr +1 : str, len);return true; }
@@ -701,7 +701,7 @@ void acpi_set_modalias(struct acpi_device *adev, const char *default_id, char *modalias, size_t len) {if (!acpi_of_modalias (adev, modalias, len)) -strlcpy (modalias, default_id, len); +strscpy (modalias, default_id, len); }EXPORT_SYMBOL_GPL (acpi_set_modalias);
drivers/acpi/processor_idle.c +4 -4
@@ -743,7 +743,7 @@ static int acpi_processor_setup_cstates(struct acpi_processor *pr) state = &drv->states[count];snprintf (state->name,CPUIDLE_NAME_LEN ,"C%d" , i); -strlcpy (state->desc, cx->desc,CPUIDLE_DESC_LEN ); +strscpy (state->desc, cx->desc,CPUIDLE_DESC_LEN ); state->exit_latency = cx->latency; state->target_residency = cx->latency * latency_factor; state->enter = acpi_idle_enter;
@@ -910,7 +910,7 @@ static int acpi_processor_evaluate_lpi(acpi_handle handle, obj = pkg_elem +9 ;if (obj->type ==ACPI_TYPE_STRING ) -strlcpy (lpi_state->desc, obj->string.pointer, +strscpy (lpi_state->desc, obj->string.pointer,ACPI_CX_DESC_LEN ); lpi_state->index = state_idx;
@@ -976,7 +976,7 @@ static bool combine_lpi_states(struct acpi_lpi_state *local, result->arch_flags = parent->arch_flags; result->index = parent->index; -strlcpy (result->desc, local->desc,ACPI_CX_DESC_LEN ); +strscpy (result->desc, local->desc,ACPI_CX_DESC_LEN );strlcat (result->desc,"+" ,ACPI_CX_DESC_LEN );strlcat (result->desc, parent->desc,ACPI_CX_DESC_LEN );return true;
@@ -1145,7 +1145,7 @@ static int acpi_processor_setup_lpi_states(struct acpi_processor *pr) state = &drv->states[i];snprintf (state->name,CPUIDLE_NAME_LEN ,"LPI-%d" , i); -strlcpy (state->desc, lpi->desc,CPUIDLE_DESC_LEN ); +strscpy (state->desc, lpi->desc,CPUIDLE_DESC_LEN ); state->exit_latency = lpi->wake_latency; state->target_residency = lpi->min_residency;if (lpi->arch_flags)
drivers/acpi/utils.c +3 -3
@@ -832,7 +832,7 @@ bool acpi_dev_present(const char *hid, const char *uid, s64 hrv)struct acpi_dev_match_info match = {};struct device *dev; -strlcpy (match.hid[0 ].id, hid,sizeof (match.hid[0 ].id)); +strscpy (match.hid[0 ].id, hid,sizeof (match.hid[0 ].id)); match.uid = uid; match.hrv = hrv;
@@ -861,7 +861,7 @@ acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv)struct acpi_dev_match_info match = {};struct device *dev; -strlcpy (match.hid[0 ].id, hid,sizeof (match.hid[0 ].id)); +strscpy (match.hid[0 ].id, hid,sizeof (match.hid[0 ].id)); match.uid = uid; match.hrv = hrv;
@@ -879,7 +879,7 @@ EXPORT_SYMBOL(acpi_video_backlight_string);static int __init acpi_backlight (char *str) { -strlcpy (acpi_video_backlight_string, str, +strscpy (acpi_video_backlight_string, str,sizeof (acpi_video_backlight_string));return 1 ; }
drivers/base/dd.c +1 -1
@@ -756,7 +756,7 @@ static int __init save_async_options(char *buf)if (strlen (buf) >=ASYNC_DRV_NAMES_MAX_LEN )pr_warn ("Too long list of driver names for 'driver_async_probe'!\n" ); -strlcpy (async_probe_drv_names, buf,ASYNC_DRV_NAMES_MAX_LEN ); +strscpy (async_probe_drv_names, buf,ASYNC_DRV_NAMES_MAX_LEN );return 0 ; }__setup ("driver_async_probe=" , save_async_options);
drivers/block/drbd/drbd_nl.c +2 -1
@@ -4824,7 +4824,8 @@ void notify_helper(enum drbd_notification_type type,struct drbd_genlmsghdr *dh;int err; -strlcpy (helper_info.helper_name, name,sizeof (helper_info.helper_name)); +strscpy (helper_info.helper_name, name, +sizeof (helper_info.helper_name)); helper_info.helper_name_len =min (strlen (name),sizeof (helper_info.helper_name)); helper_info.helper_status = status;
drivers/block/mtip32xx/mtip32xx.c +10 -10
@@ -1409,15 +1409,15 @@ static void mtip_dump_identify(struct mtip_port *port)if (!port->identify_valid)return ; -strlcpy (cbuf, (char *)(port->identify+10 ),21 ); +strscpy (cbuf, (char *)(port->identify +10 ),21 );dev_info (&port->dd->pdev->dev,"Serial No.: %s\n" , cbuf); -strlcpy (cbuf, (char *)(port->identify+23 ),9 ); +strscpy (cbuf, (char *)(port->identify +23 ),9 );dev_info (&port->dd->pdev->dev,"Firmware Ver.: %s\n" , cbuf); -strlcpy (cbuf, (char *)(port->identify+27 ),41 ); +strscpy (cbuf, (char *)(port->identify +27 ),41 );dev_info (&port->dd->pdev->dev,"Model: %s\n" , cbuf); dev_info(&port->dd->pdev->dev, "Security: %04x %s\n",
@@ -1433,13 +1433,13 @@ static void mtip_dump_identify(struct mtip_port *port)pci_read_config_word (port->dd->pdev,PCI_REVISION_ID , &revid);switch (revid &0xFF ) {case 0x1 : -strlcpy (cbuf,"A0" ,3 ); +strscpy (cbuf,"A0" ,3 );break ;case 0x3 : -strlcpy (cbuf,"A2" ,3 ); +strscpy (cbuf,"A2" ,3 );break ;default : -strlcpy (cbuf,"?" ,2 ); +strscpy (cbuf,"?" ,2 );break ; } dev_info(&port->dd->pdev->dev,
@@ -2177,8 +2177,8 @@ static ssize_t show_device_status(struct device_driver *drv, char *buf)if (dd->port && dd->port->identify && dd->port->identify_valid) { -strlcpy (id_buf, - (char *) (dd->port->identify +10 ),21 ); +strscpy (id_buf, + (char *)(dd->port->identify +10 ),21 ); status = *(dd->port->identify +141 ); }else {memset (id_buf,0 ,42 );
@@ -2207,8 +2207,8 @@ static ssize_t show_device_status(struct device_driver *drv, char *buf)if (dd->port && dd->port->identify && dd->port->identify_valid) { -strlcpy (id_buf, - (char *) (dd->port->identify+10 ),21 ); +strscpy (id_buf, + (char *)(dd->port->identify +10 ),21 ); status = *(dd->port->identify +141 ); }else {memset (id_buf,0 ,42 );
drivers/block/ps3vram.c +1 -1
@@ -761,7 +761,7 @@ static int ps3vram_probe(struct ps3_system_bus_device *dev) gendisk->fops = &ps3vram_fops; gendisk->queue = queue; gendisk->private_data = dev; -strlcpy (gendisk->disk_name,DEVICE_NAME ,sizeof (gendisk->disk_name)); +strscpy (gendisk->disk_name,DEVICE_NAME ,sizeof (gendisk->disk_name));set_capacity (gendisk, priv->size >>9 ); dev_info(&dev->core, "%s: Using %llu MiB of GPU memory\n",
drivers/block/rnbd/rnbd-clt-sysfs.c +3 -3
@@ -97,7 +97,7 @@ static int rnbd_clt_parse_map_options(const char *buf, size_t max_path_cnt,kfree (p); goto out; } -strlcpy (opt->sessname, p,NAME_MAX ); +strscpy (opt->sessname, p,NAME_MAX );kfree (p);break ;
@@ -140,7 +140,7 @@ static int rnbd_clt_parse_map_options(const char *buf, size_t max_path_cnt,kfree (p); goto out; } -strlcpy (opt->pathname, p,NAME_MAX ); +strscpy (opt->pathname, p,NAME_MAX );kfree (p);break ;
@@ -473,7 +473,7 @@ static int rnbd_clt_get_path_name(struct rnbd_clt_dev *dev, char *buf,int ret;char pathname[NAME_MAX ], *s; -strlcpy (pathname, dev->pathname,sizeof (pathname)); +strscpy (pathname, dev->pathname,sizeof (pathname));while ((s =strchr (pathname,'/' ))) s[0 ] ='!' ;
drivers/block/rnbd/rnbd-clt.c +3 -3
@@ -566,7 +566,7 @@ static int send_msg_open(struct rnbd_clt_dev *dev, bool wait) msg.hdr.type =cpu_to_le16 (RNBD_MSG_OPEN ); msg.access_mode = dev->access_mode; -strlcpy (msg.dev_name, dev->pathname,sizeof (msg.dev_name)); +strscpy (msg.dev_name, dev->pathname,sizeof (msg.dev_name));WARN_ON (!rnbd_clt_get_dev (dev)); err = send_usr_msg(sess->rtrs, READ, iu,
@@ -786,7 +786,7 @@ static struct rnbd_clt_session *alloc_sess(const char *sessname) sess =kzalloc_node (sizeof (*sess),GFP_KERNEL ,NUMA_NO_NODE );if (!sess)return ERR_PTR (-ENOMEM ); -strlcpy (sess->sessname, sessname,sizeof (sess->sessname)); +strscpy (sess->sessname, sessname,sizeof (sess->sessname));atomic_set (&sess->busy,0 );mutex_init (&sess->lock);INIT_LIST_HEAD (&sess->devs_list);
@@ -1384,7 +1384,7 @@ static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess, dev->clt_device_id = ret; dev->sess = sess; dev->access_mode = access_mode; -strlcpy (dev->pathname, pathname,sizeof (dev->pathname)); +strscpy (dev->pathname, pathname,sizeof (dev->pathname));mutex_init (&dev->lock);refcount_set (&dev->refcount,1 ); dev->dev_state =DEV_STATE_INIT ;
drivers/block/rnbd/rnbd-srv.c +3 -3
@@ -298,7 +298,7 @@ static int create_sess(struct rtrs_srv *rtrs)mutex_unlock (&sess_lock); srv_sess->rtrs = rtrs; -strlcpy (srv_sess->sessname, sessname,sizeof (srv_sess->sessname)); +strscpy (srv_sess->sessname, sessname,sizeof (srv_sess->sessname));rtrs_srv_set_sess_priv (rtrs, srv_sess);
@@ -428,7 +428,7 @@ static struct rnbd_srv_dev *rnbd_srv_init_srv_dev(const char *id)if (!dev)return ERR_PTR (-ENOMEM ); -strlcpy (dev->id, id,sizeof (dev->id)); +strscpy (dev->id, id,sizeof (dev->id));kref_init (&dev->kref);INIT_LIST_HEAD (&dev->sess_dev_list);mutex_init (&dev->lock);
@@ -575,7 +575,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess,kref_init (&sdev->kref); -strlcpy (sdev->pathname, open_msg->dev_name,sizeof (sdev->pathname)); +strscpy (sdev->pathname, open_msg->dev_name,sizeof (sdev->pathname)); sdev->rnbd_dev = rnbd_dev; sdev->sess = srv_sess;
drivers/block/zram/zram_drv.c +4 -3
@@ -471,7 +471,7 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } -strlcpy (file_name, buf,PATH_MAX ); +strscpy (file_name, buf,PATH_MAX );/* ignore trailing newline */ sz =strlen (file_name);if (sz >0 && file_name[sz -1 ] =='\n' )
@@ -994,7 +994,7 @@ static ssize_t comp_algorithm_store(struct device *dev,char compressor[ARRAY_SIZE (zram->compressor)];size_t sz; -strlcpy (compressor, buf,sizeof (compressor)); +strscpy (compressor, buf,sizeof (compressor));/* ignore trailing newline */ sz =strlen (compressor);if (sz >0 && compressor[sz -1 ] =='\n' )
@@ -1960,7 +1960,8 @@ static int zram_add(void)blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , zram->disk->queue);device_add_disk (NULL , zram->disk, zram_disk_attr_groups); -strlcpy (zram->compressor, default_compressor,sizeof (zram->compressor)); +strscpy (zram->compressor, default_compressor, +sizeof (zram->compressor));zram_debugfs_register (zram);pr_info ("Added device: %s\n" , zram->disk->disk_name);
drivers/char/ipmi/ipmi_ssif.c +1 -1
@@ -1395,7 +1395,7 @@ static int ssif_detect(struct i2c_client *client, struct i2c_board_info *info)if (rv) rv = -ENODEV ;else -strlcpy (info->type,DEVICE_NAME ,I2C_NAME_SIZE ); +strscpy (info->type,DEVICE_NAME ,I2C_NAME_SIZE );kfree (resp);return rv; }
drivers/char/tpm/tpm_ppi.c +1 -1
@@ -380,7 +380,7 @@ void tpm_add_ppi(struct tpm_chip *chip)TPM_PPI_FN_VERSION , NULL, ACPI_TYPE_STRING);if (obj) { -strlcpy (chip->ppi_version, obj->string.pointer, +strscpy (chip->ppi_version, obj->string.pointer,sizeof (chip->ppi_version));ACPI_FREE (obj); }
drivers/clk/clkdev.c +1 -1
@@ -165,7 +165,7 @@ vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt, cla->cl.clk_hw = hw;if (con_id) { -strlcpy (cla->con_id, con_id,sizeof (cla->con_id)); +strscpy (cla->con_id, con_id,sizeof (cla->con_id)); cla->cl.con_id = cla->con_id; }
drivers/clk/mvebu/dove-divider.c +1 -1
@@ -170,7 +170,7 @@ static struct clk *clk_register_dove_divider(struct device *dev, .num_parents = num_parents, }; -strlcpy (name, dc->name,sizeof (name)); +strscpy (name, dc->name,sizeof (name)); dc->hw.init = &init; dc->base = base;
drivers/clk/tegra/clk-bpmp.c +1 -1
@@ -344,7 +344,7 @@ static int tegra_bpmp_clk_get_info(struct tegra_bpmp *bpmp, unsigned int id,if (err <0 )return err; -strlcpy (info->name, response.name,MRQ_CLK_NAME_MAXLEN ); +strscpy (info->name, response.name,MRQ_CLK_NAME_MAXLEN ); info->num_parents = response.num_parents;for (i =0 ; i < info->num_parents; i++)
drivers/cpuidle/cpuidle-powernv.c +2 -2
@@ -233,8 +233,8 @@ static inline void add_powernv_state(int index, const char *name,unsigned int exit_latency, u64 psscr_val, u64 psscr_mask) { - strlcpy(powernv_states[index].name, name, CPUIDLE_NAME_LEN); -strlcpy (powernv_states[index].desc, name,CPUIDLE_NAME_LEN ); + strscpy(powernv_states->name, name, CPUIDLE_NAME_LEN); +strscpy (powernv_states->desc, name,CPUIDLE_NAME_LEN ); powernv_states[index].flags = flags; powernv_states[index].target_residency = target_residency; powernv_states[index].exit_latency = exit_latency;
drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c +3 -3
@@ -97,7 +97,7 @@ static int dev_supports_eng_type(struct otx_cpt_eng_grps *eng_grps,static void set_ucode_filename (struct otx_cpt_ucode *ucode,const char *filename) { -strlcpy (ucode->filename, filename,OTX_CPT_UCODE_NAME_LENGTH ); +strscpy (ucode->filename, filename,OTX_CPT_UCODE_NAME_LENGTH ); }static char *get_eng_type_str (int eng_type)
@@ -138,7 +138,7 @@ static int get_ucode_type(struct otx_cpt_ucode_hdr *ucode_hdr, int *ucode_type)u32 i, val =0 ;u8 nn; -strlcpy (tmp_ver_str, ucode_hdr->ver_str,OTX_CPT_UCODE_VER_STR_SZ ); +strscpy (tmp_ver_str, ucode_hdr->ver_str,OTX_CPT_UCODE_VER_STR_SZ );for (i =0 ; i <strlen (tmp_ver_str); i++) tmp_ver_str[i] =tolower (tmp_ver_str[i]);
@@ -1328,7 +1328,7 @@ static ssize_t ucode_load_store(struct device *dev, eng_grps = container_of(attr, struct otx_cpt_eng_grps, ucode_load_attr); err_msg ="Invalid engine group format" ; -strlcpy (tmp_buf, buf,OTX_CPT_UCODE_NAME_LENGTH ); +strscpy (tmp_buf, buf,OTX_CPT_UCODE_NAME_LENGTH ); start = tmp_buf; has_se = has_ie = has_ae = false;
drivers/crypto/qat/qat_common/adf_cfg.c +3 -3
@@ -230,13 +230,13 @@ int adf_cfg_add_key_value_param(struct adf_accel_dev *accel_dev,return -ENOMEM ;INIT_LIST_HEAD (&key_val->list); -strlcpy (key_val->key, key,sizeof (key_val->key)); +strscpy (key_val->key, key,sizeof (key_val->key));if (type ==ADF_DEC ) {snprintf (key_val->val,ADF_CFG_MAX_VAL_LEN_IN_BYTES ,"%ld" , (*((long *)val))); }else if (type ==ADF_STR ) { -strlcpy (key_val->val, (char *)val,sizeof (key_val->val)); +strscpy (key_val->val, (char *)val,sizeof (key_val->val)); }else if (type ==ADF_HEX ) {snprintf (key_val->val,ADF_CFG_MAX_VAL_LEN_IN_BYTES ,"0x%lx" , (unsigned long )val);
@@ -276,7 +276,7 @@ int adf_cfg_section_add(struct adf_accel_dev *accel_dev, const char *name)if (!sec)return -ENOMEM ; -strlcpy (sec->name, name,sizeof (sec->name)); +strscpy (sec->name, name,sizeof (sec->name));INIT_LIST_HEAD (&sec->param_head);down_write (&cfg->lock);list_add_tail (&sec->list, &cfg->sec_list);
drivers/crypto/qat/qat_common/adf_ctl_drv.c +2 -1
@@ -363,7 +363,8 @@ static int adf_ctl_ioctl_get_status(struct file *fp, unsigned int cmd, dev_info.num_logical_accel = hw_data->num_logical_accel; dev_info.banks_per_accel = hw_data->num_banks / hw_data->num_logical_accel; -strlcpy (dev_info.name, hw_data->dev_class->name,sizeof (dev_info.name)); +strscpy (dev_info.name, hw_data->dev_class->name, +sizeof (dev_info.name)); dev_info.instance_id = hw_data->instance_id; dev_info.type = hw_data->dev_class->type; dev_info.bus =accel_to_pci_dev (accel_dev)->bus->number;
drivers/crypto/qat/qat_common/adf_transport_debug.c +1 -1
@@ -95,7 +95,7 @@ int adf_ring_debugfs_add(struct adf_etr_ring_data *ring, const char *name)if (!ring_debug)return -ENOMEM ; -strlcpy (ring_debug->ring_name, name,sizeof (ring_debug->ring_name)); +strscpy (ring_debug->ring_name, name,sizeof (ring_debug->ring_name));snprintf (entry_name,sizeof (entry_name),"ring_%02d" , ring->ring_number);
drivers/dma-buf/sw_sync.c +1 -1
@@ -85,7 +85,7 @@ static struct sync_timeline *sync_timeline_create(const char *name)kref_init (&obj->kref); obj->context =dma_fence_context_alloc (1 ); -strlcpy (obj->name, name,sizeof (obj->name)); +strscpy (obj->name, name,sizeof (obj->name)); obj->pt_tree =RB_ROOT ;INIT_LIST_HEAD (&obj->pt_list);
drivers/dma-buf/sync_file.c +4 -4
@@ -131,7 +131,7 @@ EXPORT_SYMBOL(sync_file_get_fence);char *sync_file_get_name (struct sync_file *sync_file,char *buf,int len) {if (sync_file->user_name[0 ]) { -strlcpy (buf, sync_file->user_name, len); +strscpy (buf, sync_file->user_name, len); }else {struct dma_fence *fence = sync_file->fence;
@@ -283,7 +283,7 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, goto err; } -strlcpy (sync_file->user_name, name,sizeof (sync_file->user_name)); +strscpy (sync_file->user_name, name,sizeof (sync_file->user_name));return sync_file; err:
@@ -378,9 +378,9 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file,static int sync_fill_fence_info (struct dma_fence *fence,struct sync_fence_info *info) { -strlcpy (info->obj_name, fence->ops->get_timeline_name (fence), +strscpy (info->obj_name, fence->ops->get_timeline_name (fence),sizeof (info->obj_name)); -strlcpy (info->driver_name, fence->ops->get_driver_name (fence), +strscpy (info->driver_name, fence->ops->get_driver_name (fence),sizeof (info->driver_name)); info->status =dma_fence_get_status (fence);
drivers/dma/dmatest.c +6 -6
@@ -1092,8 +1092,8 @@ static void add_threaded_test(struct dmatest_info *info)/* Copy test parameters */ params->buf_size = test_buf_size; -strlcpy (params->channel,strim (test_channel),sizeof (params->channel)); -strlcpy (params->device,strim (test_device),sizeof (params->device)); +strscpy (params->channel,strim (test_channel),sizeof (params->channel)); +strscpy (params->device,strim (test_device),sizeof (params->device)); params->threads_per_chan = threads_per_chan; params->max_channels = max_channels; params->iterations = iterations;
@@ -1237,7 +1237,7 @@ static int dmatest_chan_set(const char *val, const struct kernel_param *kp) dtc =list_last_entry (&info->channels, struct dmatest_chan, node); -strlcpy (chan_reset_val, +strscpy (chan_reset_val,dma_chan_name (dtc->chan),sizeof (chan_reset_val)); ret = -EBUSY ;
@@ -1260,14 +1260,14 @@ static int dmatest_chan_set(const char *val, const struct kernel_param *kp)if ((strcmp (dma_chan_name (dtc->chan),strim (test_channel)) !=0 ) && (strcmp ("" ,strim (test_channel)) !=0 )) { ret = -EINVAL ; -strlcpy (chan_reset_val,dma_chan_name (dtc->chan), +strscpy (chan_reset_val,dma_chan_name (dtc->chan),sizeof (chan_reset_val)); goto add_chan_err; } }else {/* Clear test_channel if no channels were added successfully */ -strlcpy (chan_reset_val,"" ,sizeof (chan_reset_val)); +strscpy (chan_reset_val,"" ,sizeof (chan_reset_val)); ret = -EBUSY ; goto add_chan_err; }
@@ -1292,7 +1292,7 @@ static int dmatest_chan_get(char *val, const struct kernel_param *kp)mutex_lock (&info->lock);if (!is_threaded_test_run (info) && !is_threaded_test_pending (info)) {stop_threaded_test (info); -strlcpy (test_channel,"" ,sizeof (test_channel)); +strscpy (test_channel,"" ,sizeof (test_channel)); }mutex_unlock (&info->lock);
drivers/dma/xilinx/xilinx_dpdma.c +1 -1
@@ -377,7 +377,7 @@ static ssize_t xilinx_dpdma_debugfs_read(struct file *f, char __user *buf,if (ret <0 ) goto done; }else { -strlcpy (kern_buff,"No testcase executed" , +strscpy (kern_buff,"No testcase executed" ,XILINX_DPDMA_DEBUGFS_READ_MAX_SIZE ); }
drivers/eisa/eisa-bus.c +1 -2
@@ -60,8 +60,7 @@ static void __init eisa_name_device(struct eisa_device *edev)int i;for (i =0 ; i <EISA_INFOS ; i++) {if (!strcmp (edev->id.sig, eisa_table[i].id.sig)) { -strlcpy (edev->pretty_name, - eisa_table[i].name, +strscpy (edev->pretty_name, eisa_table[i].name,sizeof (edev->pretty_name));return ; }
drivers/firmware/arm_scmi/base.c +1 -1
@@ -234,7 +234,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, ret =scmi_do_xfer (handle, t);if (!ret) -strlcpy (name, t->rx.buf,SCMI_MAX_STR_SIZE ); +strscpy (name, t->rx.buf,SCMI_MAX_STR_SIZE );scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/clock.c +1 -1
@@ -115,7 +115,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, ret =scmi_do_xfer (handle, t);if (!ret) -strlcpy (clk->name, attr->name,SCMI_MAX_STR_SIZE ); +strscpy (clk->name, attr->name,SCMI_MAX_STR_SIZE );else clk->name[0 ] ='\0' ;
drivers/firmware/arm_scmi/perf.c +1 -1
@@ -242,7 +242,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->mult_factor = (dom_info->sustained_freq_khz *1000 ) / dom_info->sustained_perf_level; -strlcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); +strscpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); }scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/power.c +1 -1
@@ -118,7 +118,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->state_set_notify =SUPPORTS_STATE_SET_NOTIFY (flags); dom_info->state_set_async =SUPPORTS_STATE_SET_ASYNC (flags); dom_info->state_set_sync =SUPPORTS_STATE_SET_SYNC (flags); -strlcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); +strscpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); }scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/reset.c +1 -1
@@ -112,7 +112,7 @@ scmi_reset_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->latency_us =le32_to_cpu (attr->latency);if (dom_info->latency_us ==U32_MAX ) dom_info->latency_us =0 ; -strlcpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); +strscpy (dom_info->name, attr->name,SCMI_MAX_STR_SIZE ); }scmi_xfer_put (handle, t);
drivers/firmware/arm_scmi/sensors.c +2 -1
@@ -162,7 +162,8 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle, s->scale |=SENSOR_SCALE_EXTEND ; s->async =SUPPORTS_ASYNC_READ (attrl); s->num_trip_points =NUM_TRIP_POINTS (attrl); -strlcpy (s->name, buf->desc[cnt].name,SCMI_MAX_STR_SIZE ); +strscpy (s->name, buf->desc[cnt].name, +SCMI_MAX_STR_SIZE ); } desc_index += num_returned;
drivers/gpu/drm/amd/amdgpu/atom.c +1 -1
@@ -1350,7 +1350,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios) str =CSTR (idx);if (*str !='\0' ) {pr_info ("ATOM BIOS: %s\n" , str); -strlcpy (ctx->vbios_version, str,sizeof (ctx->vbios_version)); +strscpy (ctx->vbios_version, str,sizeof (ctx->vbios_version)); }
drivers/gpu/drm/amd/pm/amdgpu_dpm.c +1 -1
@@ -860,7 +860,7 @@ void amdgpu_add_thermal_controller(struct amdgpu_device *adev)struct i2c_board_info info = { };const char *name = pp_lib_thermal_controller_names[controller->ucType]; info.addr = controller->ucI2cAddress >>1 ; -strlcpy (info.type, name,sizeof (info.type)); +strscpy (info.type, name,sizeof (info.type));i2c_new_client_device (&adev->pm.i2c_bus->adapter, &info); } }else {
drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c +3 -3
@@ -538,8 +538,8 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev)if (ret <0 )return ret; -strlcpy (card->driver,DRIVER_NAME ,sizeof (card->driver)); -strlcpy (card->shortname,"DW-HDMI" ,sizeof (card->shortname)); +strscpy (card->driver,DRIVER_NAME ,sizeof (card->driver)); +strscpy (card->shortname,"DW-HDMI" ,sizeof (card->shortname));snprintf (card->longname,sizeof (card->longname),"%s rev 0x%02x, irq %d" , card->shortname, revision, data->irq);
@@ -557,7 +557,7 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev) dw->pcm = pcm; pcm->private_data = dw; -strlcpy (pcm->name,DRIVER_NAME ,sizeof (pcm->name)); +strscpy (pcm->name,DRIVER_NAME ,sizeof (pcm->name));snd_pcm_set_ops (pcm,SNDRV_PCM_STREAM_PLAYBACK , &snd_dw_hdmi_ops);/*
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +1 -1
@@ -528,7 +528,7 @@ static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi *hdmi) adap->owner =THIS_MODULE ; adap->dev.parent = hdmi->dev; adap->algo = &dw_hdmi_algorithm; -strlcpy (adap->name,"DesignWare HDMI" ,sizeof (adap->name)); +strscpy (adap->name,"DesignWare HDMI" ,sizeof (adap->name));i2c_set_adapdata (adap, hdmi); ret =i2c_add_adapter (adap);
drivers/gpu/drm/drm_dp_helper.c +1 -1
@@ -1665,7 +1665,7 @@ int drm_dp_aux_register(struct drm_dp_aux *aux) aux->ddc.owner =THIS_MODULE ; aux->ddc.dev.parent = aux->dev; -strlcpy (aux->ddc.name, aux->name ? aux->name :dev_name (aux->dev), +strscpy (aux->ddc.name, aux->name ? aux->name :dev_name (aux->dev),sizeof (aux->ddc.name)); ret =drm_dp_aux_register_devnode (aux);
drivers/gpu/drm/drm_dp_mst_topology.c +1 -1
@@ -5674,7 +5674,7 @@ static int drm_dp_mst_register_i2c_bus(struct drm_dp_mst_port *port) aux->ddc.dev.parent = parent_dev; aux->ddc.dev.of_node = parent_dev->of_node; -strlcpy (aux->ddc.name, aux->name ? aux->name :dev_name (parent_dev), +strscpy (aux->ddc.name, aux->name ? aux->name :dev_name (parent_dev),sizeof (aux->ddc.name));return i2c_add_adapter (&aux->ddc);
drivers/gpu/drm/drm_mipi_dsi.c +1 -1
@@ -223,7 +223,7 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *host, dsi->dev.of_node = info->node; dsi->channel = info->channel; -strlcpy (dsi->name, info->type,sizeof (dsi->name)); +strscpy (dsi->name, info->type,sizeof (dsi->name)); ret =mipi_dsi_device_add (dsi);if (ret) {
drivers/gpu/drm/i2c/tda998x_drv.c +1 -1
@@ -1948,7 +1948,7 @@ static int tda998x_create(struct device *dev)* offset. */ memset (&cec_info,0 ,sizeof (cec_info)); -strlcpy (cec_info.type,"tda9950" ,sizeof (cec_info.type)); +strscpy (cec_info.type,"tda9950" ,sizeof (cec_info.type)); cec_info.addr = priv->cec_addr; cec_info.platform_data = &priv->cec_glue; cec_info.irq = client->irq;
drivers/gpu/drm/i915/selftests/i915_perf.c +1 -1
@@ -28,7 +28,7 @@ alloc_empty_config(struct i915_perf *perf) oa_config->perf = perf;kref_init (&oa_config->ref); -strlcpy (oa_config->uuid,TEST_OA_CONFIG_UUID ,sizeof (oa_config->uuid)); +strscpy (oa_config->uuid,TEST_OA_CONFIG_UUID ,sizeof (oa_config->uuid));mutex_lock (&perf->metrics_lock);
drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c +1 -1
@@ -292,7 +292,7 @@ static int mtk_hdmi_ddc_probe(struct platform_device *pdev)return ret; } -strlcpy (ddc->adap.name,"mediatek-hdmi-ddc" ,sizeof (ddc->adap.name)); +strscpy (ddc->adap.name,"mediatek-hdmi-ddc" ,sizeof (ddc->adap.name)); ddc->adap.owner =THIS_MODULE ; ddc->adap.class =I2C_CLASS_DDC ; ddc->adap.algo = &mtk_hdmi_ddc_algorithm;
drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c +1 -1
@@ -151,7 +151,7 @@ int msm_dss_parse_clock(struct platform_device *pdev, i);break ; } -strlcpy (mp->clk_config[i].clk_name, clock_name, +strscpy (mp->clk_config[i].clk_name, clock_name,sizeof (mp->clk_config[i].clk_name)); mp->clk_config[i].type =DSS_CLK_AHB ;
drivers/gpu/drm/msm/dp/dp_parser.c +6 -3
@@ -219,21 +219,24 @@ static int dp_parser_clock(struct dp_parser *parser) core_clk_index < core_clk_count) {struct dss_clk *clk = &core_power->clk_config[core_clk_index]; -strlcpy (clk->clk_name, clk_name,sizeof (clk->clk_name)); +strscpy (clk->clk_name, clk_name, +sizeof (clk->clk_name)); clk->type =DSS_CLK_AHB ; core_clk_index++; } else if (dp_parser_check_prefix("stream", clk_name) && stream_clk_index < stream_clk_count) {struct dss_clk *clk = &stream_power->clk_config[stream_clk_index]; -strlcpy (clk->clk_name, clk_name,sizeof (clk->clk_name)); +strscpy (clk->clk_name, clk_name, +sizeof (clk->clk_name)); clk->type =DSS_CLK_PCLK ; stream_clk_index++; } else if (dp_parser_check_prefix("ctrl", clk_name) && ctrl_clk_index < ctrl_clk_count) {struct dss_clk *clk = &ctrl_power->clk_config[ctrl_clk_index]; -strlcpy (clk->clk_name, clk_name,sizeof (clk->clk_name)); +strscpy (clk->clk_name, clk_name, +sizeof (clk->clk_name)); ctrl_clk_index++;if (dp_parser_check_prefix ("ctrl_link" , clk_name) ||dp_parser_check_prefix ("stream_pixel" , clk_name))
drivers/gpu/drm/radeon/radeon_atombios.c +2 -2
@@ -2110,7 +2110,7 @@ static int radeon_atombios_parse_power_table_1_3(struct radeon_device *rdev)const char *name = thermal_controller_names[power_info->info. ucOverdriveThermalController]; info.addr = power_info->info.ucOverdriveControllerAddress >>1 ; -strlcpy (info.type, name,sizeof (info.type)); +strscpy (info.type, name,sizeof (info.type));i2c_new_client_device (&rdev->pm.i2c_bus->adapter, &info); } }
@@ -2350,7 +2350,7 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *rstruct i2c_board_info info = { };const char *name = pp_lib_thermal_controller_names[controller->ucType]; info.addr = controller->ucI2cAddress >>1 ; -strlcpy (info.type, name,sizeof (info.type)); +strscpy (info.type, name,sizeof (info.type));i2c_new_client_device (&rdev->pm.i2c_bus->adapter, &info); } }else {
drivers/gpu/drm/radeon/radeon_combios.c +2 -2
@@ -2703,7 +2703,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)struct i2c_board_info info = { };const char *name = thermal_controller_names[thermal_controller]; info.addr = i2c_addr >>1 ; -strlcpy (info.type, name,sizeof (info.type)); +strscpy (info.type, name,sizeof (info.type));i2c_new_client_device (&rdev->pm.i2c_bus->adapter, &info); } }
@@ -2720,7 +2720,7 @@ void radeon_combios_get_power_modes(struct radeon_device *rdev)struct i2c_board_info info = { };const char *name ="f75375" ; info.addr =0x28 ; -strlcpy (info.type, name,sizeof (info.type)); +strscpy (info.type, name,sizeof (info.type));i2c_new_client_device (&rdev->pm.i2c_bus->adapter, &info);DRM_INFO ("Possible %s thermal controller at 0x%02x\n" , name, info.addr);
drivers/gpu/drm/rockchip/inno_hdmi.c +1 -1
@@ -787,7 +787,7 @@ static struct i2c_adapter *inno_hdmi_i2c_adapter(struct inno_hdmi *hdmi) adap->dev.parent = hdmi->dev; adap->dev.of_node = hdmi->dev->of_node; adap->algo = &inno_hdmi_algorithm; -strlcpy (adap->name,"Inno HDMI" ,sizeof (adap->name)); +strscpy (adap->name,"Inno HDMI" ,sizeof (adap->name));i2c_set_adapdata (adap, hdmi); ret =i2c_add_adapter (adap);
drivers/gpu/drm/rockchip/rk3066_hdmi.c +1 -1
@@ -719,7 +719,7 @@ static struct i2c_adapter *rk3066_hdmi_i2c_adapter(struct rk3066_hdmi *hdmi) adap->dev.parent = hdmi->dev; adap->dev.of_node = hdmi->dev->of_node; adap->algo = &rk3066_hdmi_algorithm; -strlcpy (adap->name,"RK3066 HDMI" ,sizeof (adap->name)); +strscpy (adap->name,"RK3066 HDMI" ,sizeof (adap->name));i2c_set_adapdata (adap, hdmi); ret =i2c_add_adapter (adap);
drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c +1 -1
@@ -304,7 +304,7 @@ int sun4i_hdmi_i2c_create(struct device *dev, struct sun4i_hdmi *hdmi) adap->owner =THIS_MODULE ; adap->class =I2C_CLASS_DDC ; adap->algo = &sun4i_hdmi_i2c_algorithm; -strlcpy (adap->name,"sun4i_hdmi_i2c adapter" ,sizeof (adap->name)); +strscpy (adap->name,"sun4i_hdmi_i2c adapter" ,sizeof (adap->name));i2c_set_adapdata (adap, hdmi); ret =i2c_add_adapter (adap);
drivers/hid/hid-steam.c +5 -7
@@ -246,7 +246,7 @@ static int steam_get_serial(struct steam_device *steam)if (reply[0 ] !=0xae || reply[1 ] !=0x15 || reply[2 ] !=0x01 )return -EIO ; reply[3 +STEAM_SERIAL_LEN ] =0 ; -strlcpy (steam->serial_no, reply +3 ,sizeof (steam->serial_no)); +strscpy (steam->serial_no, reply +3 ,sizeof (steam->serial_no));return 0 ; }
@@ -514,8 +514,8 @@ static int steam_register(struct steam_device *steam)*/ mutex_lock (&steam->mutex);if (steam_get_serial (steam) <0 ) -strlcpy (steam->serial_no,"XXXXXXXXXX" , -sizeof (steam->serial_no)); +strscpy (steam->serial_no,"XXXXXXXXXX" , +sizeof (steam->serial_no));mutex_unlock (&steam->mutex); hid_info(steam->hdev, "Steam Controller '%s' connected",
@@ -689,10 +689,8 @@ static struct hid_device *steam_create_client_hid(struct hid_device *hdev) client_hdev->version = hdev->version; client_hdev->type = hdev->type; client_hdev->country = hdev->country; -strlcpy (client_hdev->name, hdev->name, -sizeof (client_hdev->name)); -strlcpy (client_hdev->phys, hdev->phys, -sizeof (client_hdev->phys)); +strscpy (client_hdev->name, hdev->name,sizeof (client_hdev->name)); +strscpy (client_hdev->phys, hdev->phys,sizeof (client_hdev->phys));/* * Since we use the same device info than the real interface to * trick userspace, we will be calling steam_probe recursively.
drivers/hid/i2c-hid/i2c-hid-core.c +1 -1
@@ -1131,7 +1131,7 @@ static int i2c_hid_probe(struct i2c_client *client,snprintf (hid->name,sizeof (hid->name),"%s %04hX:%04hX" , client->name, hid->vendor, hid->product); -strlcpy (hid->phys,dev_name (&client->dev),sizeof (hid->phys)); +strscpy (hid->phys,dev_name (&client->dev),sizeof (hid->phys)); ihid->quirks =i2c_hid_lookup_quirk (hid->vendor, hid->product);
drivers/hid/usbhid/hid-core.c +1 -1
@@ -1364,7 +1364,7 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id * hid->type =HID_TYPE_USBNONE ;if (dev->manufacturer) -strlcpy (hid->name, dev->manufacturer,sizeof (hid->name)); +strscpy (hid->name, dev->manufacturer,sizeof (hid->name));if (dev->product) {if (dev->manufacturer)
drivers/hid/usbhid/usbkbd.c +1 -1
@@ -294,7 +294,7 @@ static int usb_kbd_probe(struct usb_interface *iface,spin_lock_init (&kbd->leds_lock);if (dev->manufacturer) -strlcpy (kbd->name, dev->manufacturer,sizeof (kbd->name)); +strscpy (kbd->name, dev->manufacturer,sizeof (kbd->name));if (dev->product) {if (dev->manufacturer)
drivers/hid/usbhid/usbmouse.c +1 -1
@@ -142,7 +142,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i mouse->dev = input_dev;if (dev->manufacturer) -strlcpy (mouse->name, dev->manufacturer,sizeof (mouse->name)); +strscpy (mouse->name, dev->manufacturer,sizeof (mouse->name));if (dev->product) {if (dev->manufacturer)
drivers/hid/wacom_sys.c +3 -3
@@ -2197,7 +2197,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix) }else if (strstr (product_name,"Wacom" ) ||strstr (product_name,"wacom" ) ||strstr (product_name,"WACOM" )) { -strlcpy (name, product_name,sizeof (name)); +strscpy (name, product_name,sizeof (name)); }else {snprintf (name,sizeof (name),"Wacom %s" , product_name); }
@@ -2215,7 +2215,7 @@ static void wacom_update_name(struct wacom *wacom, const char *suffix)if (name[strlen (name)-1 ] ==' ' ) name[strlen (name)-1 ] ='\0' ; }else { -strlcpy (name, features->name,sizeof (name)); +strscpy (name, features->name,sizeof (name)); } snprintf(wacom_wac->name, sizeof(wacom_wac->name), "%s%s",
@@ -2471,7 +2471,7 @@ static void wacom_wireless_work(struct work_struct *work) goto fail; } -strlcpy (wacom_wac->name, wacom_wac1->name, +strscpy (wacom_wac->name, wacom_wac1->name,sizeof (wacom_wac->name)); error =wacom_initialize_battery (wacom);if (error)
drivers/hwmon/adc128d818.c +1 -1
@@ -384,7 +384,7 @@ static int adc128_detect(struct i2c_client *client, struct i2c_board_info *info)if (i2c_smbus_read_byte_data (client,ADC128_REG_BUSY_STATUS ) &0xfc )return -ENODEV ; -strlcpy (info->type,"adc128d818" ,I2C_NAME_SIZE ); +strscpy (info->type,"adc128d818" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adm1021.c +1 -1
@@ -411,7 +411,7 @@ static int adm1021_detect(struct i2c_client *client,pr_debug ("Detected chip %s at adapter %d, address 0x%02x.\n" , type_name,i2c_adapter_id (adapter), client->addr); -strlcpy (info->type, type_name,I2C_NAME_SIZE ); +strscpy (info->type, type_name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adm1025.c +1 -1
@@ -470,7 +470,7 @@ static int adm1025_detect(struct i2c_client *client,else return -ENODEV ; -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adm1026.c +1 -1
@@ -1610,7 +1610,7 @@ static int adm1026_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"adm1026" ,I2C_NAME_SIZE ); +strscpy (info->type,"adm1026" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adm1029.c +1 -1
@@ -329,7 +329,7 @@ static int adm1029_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"adm1029" ,I2C_NAME_SIZE ); +strscpy (info->type,"adm1029" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adm1031.c +1 -1
@@ -986,7 +986,7 @@ static int adm1031_detect(struct i2c_client *client,return -ENODEV ; name = (id ==0x30 ) ?"adm1030" :"adm1031" ; -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adm9240.c +1 -1
@@ -757,7 +757,7 @@ static int adm9240_detect(struct i2c_client *new_client, man_id ==0x23 ?"ADM9240" : man_id == 0xda ? "DS1780" : "LM81", die_rev); -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adt7411.c +1 -1
@@ -590,7 +590,7 @@ static int adt7411_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"adt7411" ,I2C_NAME_SIZE ); +strscpy (info->type,"adt7411" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adt7462.c +1 -1
@@ -1782,7 +1782,7 @@ static int adt7462_detect(struct i2c_client *client,if (revision !=ADT7462_REVISION )return -ENODEV ; -strlcpy (info->type,"adt7462" ,I2C_NAME_SIZE ); +strscpy (info->type,"adt7462" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adt7470.c +1 -1
@@ -1200,7 +1200,7 @@ static int adt7470_detect(struct i2c_client *client,if (revision !=ADT7470_REVISION )return -ENODEV ; -strlcpy (info->type,"adt7470" ,I2C_NAME_SIZE ); +strscpy (info->type,"adt7470" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/adt7475.c +1 -1
@@ -1340,7 +1340,7 @@ static int adt7475_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/amc6821.c +1 -1
@@ -809,7 +809,7 @@ static int amc6821_detect( }dev_info (&adapter->dev,"amc6821: chip found at 0x%02x.\n" , address); -strlcpy (info->type,"amc6821" ,I2C_NAME_SIZE ); +strscpy (info->type,"amc6821" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/asb100.c +1 -1
@@ -769,7 +769,7 @@ static int asb100_detect(struct i2c_client *client,if (val1 !=0x31 || val2 !=0x06 )return -ENODEV ; -strlcpy (info->type,"asb100" ,I2C_NAME_SIZE ); +strscpy (info->type,"asb100" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/asc7621.c +1 -1
@@ -1153,7 +1153,7 @@ static int asc7621_detect(struct i2c_client *client,if (company == asc7621_chips[chip_index].company_id && verstep == asc7621_chips[chip_index].verstep_id) { -strlcpy (info->type, asc7621_chips[chip_index].name, +strscpy (info->type, asc7621_chips[chip_index].name,I2C_NAME_SIZE ); dev_info(&adapter->dev, "Matched %s at 0x%02x\n",
drivers/hwmon/dell-smm-hwmon.c +3 -3
@@ -465,7 +465,7 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg)return -EPERM ;memset (buff,0 ,sizeof (buff)); -strlcpy (buff, bios_machineid,sizeof (buff)); +strscpy (buff, bios_machineid,sizeof (buff));break ;case I8K_FN_STATUS :
@@ -1240,9 +1240,9 @@ static int __init i8k_probe(void) disallow_fan_type_call = true; } -strlcpy (bios_version,i8k_get_dmi_data (DMI_BIOS_VERSION ), +strscpy (bios_version,i8k_get_dmi_data (DMI_BIOS_VERSION ),sizeof (bios_version)); -strlcpy (bios_machineid,i8k_get_dmi_data (DMI_PRODUCT_SERIAL ), +strscpy (bios_machineid,i8k_get_dmi_data (DMI_PRODUCT_SERIAL ),sizeof (bios_machineid));/*
drivers/hwmon/dme1737.c +1 -1
@@ -2456,7 +2456,7 @@ static int dme1737_i2c_detect(struct i2c_client *client,dev_info (dev,"Found a %s chip at 0x%02x (rev 0x%02x).\n" , verstep ==SCH5027_VERSTEP ?"SCH5027" :"DME1737" , client->addr, verstep); -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/emc1403.c +6 -6
@@ -329,22 +329,22 @@ static int emc1403_detect(struct i2c_client *client, id =i2c_smbus_read_byte_data (client,THERMAL_PID_REG );switch (id) {case 0x20 : -strlcpy (info->type,"emc1402" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc1402" ,I2C_NAME_SIZE );break ;case 0x21 : -strlcpy (info->type,"emc1403" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc1403" ,I2C_NAME_SIZE );break ;case 0x22 : -strlcpy (info->type,"emc1422" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc1422" ,I2C_NAME_SIZE );break ;case 0x23 : -strlcpy (info->type,"emc1423" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc1423" ,I2C_NAME_SIZE );break ;case 0x25 : -strlcpy (info->type,"emc1404" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc1404" ,I2C_NAME_SIZE );break ;case 0x27 : -strlcpy (info->type,"emc1424" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc1424" ,I2C_NAME_SIZE );break ;default :return -ENODEV ;
drivers/hwmon/emc2103.c +1 -1
@@ -643,7 +643,7 @@ emc2103_detect(struct i2c_client *new_client, struct i2c_board_info *info)if ((product !=0x24 ) && (product !=0x26 ))return -ENODEV ; -strlcpy (info->type,"emc2103" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc2103" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/emc6w201.c +1 -1
@@ -439,7 +439,7 @@ static int emc6w201_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"emc6w201" ,I2C_NAME_SIZE ); +strscpy (info->type,"emc6w201" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/f75375s.c +1 -1
@@ -897,7 +897,7 @@ static int f75375_detect(struct i2c_client *client, version =f75375_read8 (client,F75375_REG_VERSION );dev_info (&adapter->dev,"found %s version: %02X\n" , name, version); -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/fschmd.c +1 -1
@@ -1075,7 +1075,7 @@ static int fschmd_detect(struct i2c_client *client,else return -ENODEV ; -strlcpy (info->type, fschmd_id[kind].name,I2C_NAME_SIZE ); +strscpy (info->type, fschmd_id[kind].name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/ftsteutates.c +1 -1
@@ -739,7 +739,7 @@ static int fts_detect(struct i2c_client *client,if (val !=0x11 )return -ENODEV ; -strlcpy (info->type, fts_id[0 ].name,I2C_NAME_SIZE ); +strscpy (info->type, fts_id[0 ].name,I2C_NAME_SIZE ); info->flags =0 ;return 0 ; }
drivers/hwmon/gl518sm.c +1 -1
@@ -586,7 +586,7 @@ static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info)if (rev !=0x00 && rev !=0x80 )return -ENODEV ; -strlcpy (info->type,"gl518sm" ,I2C_NAME_SIZE ); +strscpy (info->type,"gl518sm" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/gl520sm.c +1 -1
@@ -811,7 +811,7 @@ static int gl520_detect(struct i2c_client *client, struct i2c_board_info *info)return -ENODEV ; } -strlcpy (info->type,"gl520sm" ,I2C_NAME_SIZE ); +strscpy (info->type,"gl520sm" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/jc42.c +1 -1
@@ -431,7 +431,7 @@ static int jc42_detect(struct i2c_client *client, struct i2c_board_info *info)struct jc42_chips *chip = &jc42_chips[i];if (manid == chip->manid && (devid & chip->devid_mask) == chip->devid) { -strlcpy (info->type,"jc42" ,I2C_NAME_SIZE ); +strscpy (info->type,"jc42" ,I2C_NAME_SIZE );return 0 ; } }
drivers/hwmon/lm63.c +3 -3
@@ -996,11 +996,11 @@ static int lm63_detect(struct i2c_client *client, }if (chip_id ==0x41 && address ==0x4c ) -strlcpy (info->type,"lm63" ,I2C_NAME_SIZE ); +strscpy (info->type,"lm63" ,I2C_NAME_SIZE );else if (chip_id ==0x51 && (address ==0x18 || address ==0x4e )) -strlcpy (info->type,"lm64" ,I2C_NAME_SIZE ); +strscpy (info->type,"lm64" ,I2C_NAME_SIZE );else if (chip_id ==0x49 && address ==0x4c ) -strlcpy (info->type,"lm96163" ,I2C_NAME_SIZE ); +strscpy (info->type,"lm96163" ,I2C_NAME_SIZE );else return -ENODEV ;
drivers/hwmon/lm73.c +1 -1
@@ -257,7 +257,7 @@ static int lm73_detect(struct i2c_client *new_client,if (id <0 || id !=LM73_ID )return -ENODEV ; -strlcpy (info->type,"lm73" ,I2C_NAME_SIZE ); +strscpy (info->type,"lm73" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm75.c +1 -1
@@ -866,7 +866,7 @@ static int lm75_detect(struct i2c_client *new_client,return -ENODEV ; } -strlcpy (info->type, is_lm75a ?"lm75a" :"lm75" ,I2C_NAME_SIZE ); +strscpy (info->type, is_lm75a ?"lm75a" :"lm75" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm77.c +1 -1
@@ -302,7 +302,7 @@ static int lm77_detect(struct i2c_client *client, struct i2c_board_info *info) || i2c_smbus_read_word_data(client, 7) != min)return -ENODEV ; -strlcpy (info->type,"lm77" ,I2C_NAME_SIZE ); +strscpy (info->type,"lm77" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm78.c +1 -1
@@ -617,7 +617,7 @@ static int lm78_i2c_detect(struct i2c_client *client,if (isa)mutex_unlock (&isa->update_lock); -strlcpy (info->type, client_name,I2C_NAME_SIZE ); +strscpy (info->type, client_name,I2C_NAME_SIZE );return 0 ;
drivers/hwmon/lm80.c +1 -1
@@ -586,7 +586,7 @@ static int lm80_detect(struct i2c_client *client, struct i2c_board_info *info) name ="lm80" ; } -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm83.c +1 -1
@@ -312,7 +312,7 @@ static int lm83_detect(struct i2c_client *new_client,return -ENODEV ; } -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm85.c +1 -1
@@ -1539,7 +1539,7 @@ static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info)if (!type_name)return -ENODEV ; -strlcpy (info->type, type_name,I2C_NAME_SIZE ); +strscpy (info->type, type_name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm87.c +1 -1
@@ -833,7 +833,7 @@ static int lm87_detect(struct i2c_client *client, struct i2c_board_info *info)return -ENODEV ; } -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm90.c +1 -1
@@ -1638,7 +1638,7 @@ static int lm90_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm92.c +1 -1
@@ -287,7 +287,7 @@ static int lm92_detect(struct i2c_client *new_client,else return -ENODEV ; -strlcpy (info->type,"lm92" ,I2C_NAME_SIZE ); +strscpy (info->type,"lm92" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm93.c +1 -1
@@ -2575,7 +2575,7 @@ static int lm93_detect(struct i2c_client *client, struct i2c_board_info *info)return -ENODEV ; } -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );dev_dbg (&adapter->dev,"loading %s at %d, 0x%02x\n" , client->name,i2c_adapter_id (client->adapter), client->addr);
drivers/hwmon/lm95234.c +1 -1
@@ -644,7 +644,7 @@ static int lm95234_detect(struct i2c_client *client,if (val & model_mask)return -ENODEV ; -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm95241.c +1 -1
@@ -389,7 +389,7 @@ static int lm95241_detect(struct i2c_client *new_client, }/* Fill the i2c board info */ -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/lm95245.c +1 -1
@@ -461,7 +461,7 @@ static int lm95245_detect(struct i2c_client *new_client,return -ENODEV ; } -strlcpy (info->type, name,I2C_NAME_SIZE ); +strscpy (info->type, name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/max1619.c +1 -1
@@ -241,7 +241,7 @@ static int max1619_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"max1619" ,I2C_NAME_SIZE ); +strscpy (info->type,"max1619" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/max1668.c +1 -1
@@ -386,7 +386,7 @@ static int max1668_detect(struct i2c_client *client,if (!type_name)return -ENODEV ; -strlcpy (info->type, type_name,I2C_NAME_SIZE ); +strscpy (info->type, type_name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/max31730.c +1 -1
@@ -399,7 +399,7 @@ static int max31730_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"max31730" ,I2C_NAME_SIZE ); +strscpy (info->type,"max31730" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/max6639.c +1 -1
@@ -511,7 +511,7 @@ static int max6639_detect(struct i2c_client *client,if (dev_id !=0x58 || manu_id !=0x4D )return -ENODEV ; -strlcpy (info->type,"max6639" ,I2C_NAME_SIZE ); +strscpy (info->type,"max6639" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/max6642.c +1 -1
@@ -148,7 +148,7 @@ static int max6642_detect(struct i2c_client *client,if ((reg_status &0x2b ) !=0x00 )return -ENODEV ; -strlcpy (info->type,"max6642" ,I2C_NAME_SIZE ); +strscpy (info->type,"max6642" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/nct7802.c +1 -1
@@ -1021,7 +1021,7 @@ static int nct7802_detect(struct i2c_client *client,if (reg <0 || (reg &0x3f ))return -ENODEV ; -strlcpy (info->type,"nct7802" ,I2C_NAME_SIZE ); +strscpy (info->type,"nct7802" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/nct7904.c +1 -1
@@ -798,7 +798,7 @@ static int nct7904_detect(struct i2c_client *client, (i2c_smbus_read_byte_data(client, BANK_SEL_REG) & 0xf8) != 0x00) return -ENODEV; -strlcpy (info->type,"nct7904" ,I2C_NAME_SIZE ); +strscpy (info->type,"nct7904" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/sch56xx-common.c +1 -1
@@ -408,7 +408,7 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent, data->addr = addr; data->io_lock = io_lock; -strlcpy (data->wdinfo.identity,"sch56xx watchdog" , +strscpy (data->wdinfo.identity,"sch56xx watchdog" ,sizeof (data->wdinfo.identity)); data->wdinfo.firmware_version = revision; data->wdinfo.options =WDIOF_KEEPALIVEPING |WDIOF_SETTIMEOUT ;
drivers/hwmon/smsc47m192.c +1 -1
@@ -582,7 +582,7 @@ static int smsc47m192_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"smsc47m192" ,I2C_NAME_SIZE ); +strscpy (info->type,"smsc47m192" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/stts751.c +1 -1
@@ -692,7 +692,7 @@ static int stts751_detect(struct i2c_client *new_client, }dev_dbg (&new_client->dev,"Chip %s detected" , name); -strlcpy (info->type, stts751_id[0 ].name,I2C_NAME_SIZE ); +strscpy (info->type, stts751_id[0 ].name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/thmc50.c +1 -1
@@ -352,7 +352,7 @@ static int thmc50_detect(struct i2c_client *client,pr_debug ("thmc50: Detected %s (version %x, revision %x)\n" , type_name, (revision >>4 ) -0xc , revision &0xf ); -strlcpy (info->type, type_name,I2C_NAME_SIZE ); +strscpy (info->type, type_name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/tmp401.c +1 -1
@@ -678,7 +678,7 @@ static int tmp401_detect(struct i2c_client *client,if (reg >15 )return -ENODEV ; -strlcpy (info->type, tmp401_id[kind].name,I2C_NAME_SIZE ); +strscpy (info->type, tmp401_id[kind].name,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/tmp421.c +1 -1
@@ -267,7 +267,7 @@ static int tmp421_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type, tmp421_id[kind].name,I2C_NAME_SIZE ); +strscpy (info->type, tmp421_id[kind].name,I2C_NAME_SIZE );dev_info (&adapter->dev,"Detected TI %s chip at 0x%02x\n" , names[kind], client->addr);
drivers/hwmon/w83781d.c +1 -1
@@ -1171,7 +1171,7 @@ w83781d_detect(struct i2c_client *client, struct i2c_board_info *info)if (isa)mutex_unlock (&isa->update_lock); -strlcpy (info->type, client_name,I2C_NAME_SIZE ); +strscpy (info->type, client_name,I2C_NAME_SIZE );return 0 ;
drivers/hwmon/w83791d.c +1 -1
@@ -1340,7 +1340,7 @@ static int w83791d_detect(struct i2c_client *client,if (val1 !=0x71 || val2 !=0x5c )return -ENODEV ; -strlcpy (info->type,"w83791d" ,I2C_NAME_SIZE ); +strscpy (info->type,"w83791d" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/w83792d.c +1 -1
@@ -1352,7 +1352,7 @@ w83792d_detect(struct i2c_client *client, struct i2c_board_info *info)if (val1 !=0x7a || val2 !=0x5c )return -ENODEV ; -strlcpy (info->type,"w83792d" ,I2C_NAME_SIZE ); +strscpy (info->type,"w83792d" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/w83793.c +1 -1
@@ -1640,7 +1640,7 @@ static int w83793_detect(struct i2c_client *client,if (chip_id !=0x7b )return -ENODEV ; -strlcpy (info->type,"w83793" ,I2C_NAME_SIZE ); +strscpy (info->type,"w83793" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/w83795.c +1 -1
@@ -1967,7 +1967,7 @@ static int w83795_detect(struct i2c_client *client,else chip_name ="w83795g" ; -strlcpy (info->type, chip_name,I2C_NAME_SIZE ); +strscpy (info->type, chip_name,I2C_NAME_SIZE );dev_info (&adapter->dev,"Found %s rev. %c at 0x%02hx\n" , chip_name,'A' + (device_id &0xf ), address);
drivers/hwmon/w83l785ts.c +1 -1
@@ -157,7 +157,7 @@ static int w83l785ts_detect(struct i2c_client *client,return -ENODEV ; } -strlcpy (info->type,"w83l785ts" ,I2C_NAME_SIZE ); +strscpy (info->type,"w83l785ts" ,I2C_NAME_SIZE );return 0 ; }
drivers/hwmon/w83l786ng.c +1 -1
@@ -687,7 +687,7 @@ w83l786ng_detect(struct i2c_client *client, struct i2c_board_info *info)return -ENODEV ; } -strlcpy (info->type,"w83l786ng" ,I2C_NAME_SIZE ); +strscpy (info->type,"w83l786ng" ,I2C_NAME_SIZE );return 0 ; }
drivers/i2c/busses/i2c-altera.c +1 -1
@@ -448,7 +448,7 @@ static int altr_i2c_probe(struct platform_device *pdev)mutex_unlock (&idev->isr_mutex);i2c_set_adapdata (&idev->adapter, idev); -strlcpy (idev->adapter.name, pdev->name,sizeof (idev->adapter.name)); +strscpy (idev->adapter.name, pdev->name,sizeof (idev->adapter.name)); idev->adapter.owner =THIS_MODULE ; idev->adapter.algo = &altr_i2c_algo; idev->adapter.dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-aspeed.c +1 -1
@@ -1020,7 +1020,7 @@ static int aspeed_i2c_probe_bus(struct platform_device *pdev) bus->adap.algo = &aspeed_i2c_algo; bus->adap.dev.parent = &pdev->dev; bus->adap.dev.of_node = pdev->dev.of_node; -strlcpy (bus->adap.name, pdev->name,sizeof (bus->adap.name)); +strscpy (bus->adap.name, pdev->name,sizeof (bus->adap.name));i2c_set_adapdata (&bus->adap, bus); bus->dev = &pdev->dev;
drivers/i2c/busses/i2c-au1550.c +1 -1
@@ -321,7 +321,7 @@ i2c_au1550_probe(struct platform_device *pdev) priv->adap.algo = &au1550_algo; priv->adap.algo_data = priv; priv->adap.dev.parent = &pdev->dev; -strlcpy (priv->adap.name,"Au1xxx PSC I2C" ,sizeof (priv->adap.name)); +strscpy (priv->adap.name,"Au1xxx PSC I2C" ,sizeof (priv->adap.name));/* Now, set up the PSC for SMBus PIO mode. */ i2c_au1550_setup (priv);
drivers/i2c/busses/i2c-axxia.c +1 -1
@@ -783,7 +783,7 @@ static int axxia_i2c_probe(struct platform_device *pdev) }i2c_set_adapdata (&idev->adapter, idev); -strlcpy (idev->adapter.name, pdev->name,sizeof (idev->adapter.name)); +strscpy (idev->adapter.name, pdev->name,sizeof (idev->adapter.name)); idev->adapter.owner =THIS_MODULE ; idev->adapter.algo = &axxia_i2c_algo; idev->adapter.bus_recovery_info = &axxia_i2c_recovery_info;
drivers/i2c/busses/i2c-bcm-kona.c +1 -1
@@ -849,7 +849,7 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev) adap = &dev->adapter;i2c_set_adapdata (adap, dev); adap->owner =THIS_MODULE ; -strlcpy (adap->name,"Broadcom I2C adapter" ,sizeof (adap->name)); +strscpy (adap->name,"Broadcom I2C adapter" ,sizeof (adap->name)); adap->algo = &bcm_algo; adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node;
drivers/i2c/busses/i2c-brcmstb.c +1 -1
@@ -685,7 +685,7 @@ static int brcmstb_i2c_probe(struct platform_device *pdev) adap = &dev->adapter;i2c_set_adapdata (adap, dev); adap->owner =THIS_MODULE ; -strlcpy (adap->name,"Broadcom STB : " ,sizeof (adap->name)); +strscpy (adap->name,"Broadcom STB : " ,sizeof (adap->name));if (int_name)strlcat (adap->name, int_name,sizeof (adap->name)); adap->algo = &brcmstb_i2c_algo;
drivers/i2c/busses/i2c-cbus-gpio.c +1 -1
@@ -244,7 +244,7 @@ static int cbus_i2c_probe(struct platform_device *pdev) adapter->nr = pdev->id; adapter->timeout =HZ ; adapter->algo = &cbus_i2c_algo; -strlcpy (adapter->name,"CBUS I2C adapter" ,sizeof (adapter->name)); +strscpy (adapter->name,"CBUS I2C adapter" ,sizeof (adapter->name));spin_lock_init (&chost->lock); chost->dev = &pdev->dev;
drivers/i2c/busses/i2c-cht-wc.c +1 -1
@@ -330,7 +330,7 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev) adap->adapter.class =I2C_CLASS_HWMON ; adap->adapter.algo = &cht_wc_i2c_adap_algo; adap->adapter.lock_ops = &cht_wc_i2c_adap_lock_ops; -strlcpy (adap->adapter.name,"PMIC I2C Adapter" , +strscpy (adap->adapter.name,"PMIC I2C Adapter" ,sizeof (adap->adapter.name)); adap->adapter.dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-cros-ec-tunnel.c +1 -1
@@ -267,7 +267,7 @@ static int ec_i2c_probe(struct platform_device *pdev) bus->dev = dev; bus->adap.owner =THIS_MODULE ; -strlcpy (bus->adap.name,"cros-ec-i2c-tunnel" ,sizeof (bus->adap.name)); +strscpy (bus->adap.name,"cros-ec-i2c-tunnel" ,sizeof (bus->adap.name)); bus->adap.algo = &ec_i2c_algorithm; bus->adap.algo_data = bus; bus->adap.dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-davinci.c +1 -1
@@ -850,7 +850,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)i2c_set_adapdata (adap, dev); adap->owner =THIS_MODULE ; adap->class =I2C_CLASS_DEPRECATED ; -strlcpy (adap->name,"DaVinci I2C adapter" ,sizeof (adap->name)); +strscpy (adap->name,"DaVinci I2C adapter" ,sizeof (adap->name)); adap->algo = &i2c_davinci_algo; adap->dev.parent = &pdev->dev; adap->timeout =DAVINCI_I2C_TIMEOUT ;
drivers/i2c/busses/i2c-digicolor.c +1 -1
@@ -323,7 +323,7 @@ static int dc_i2c_probe(struct platform_device *pdev)if (ret <0 )return ret; -strlcpy (i2c->adap.name,"Conexant Digicolor I2C adapter" , +strscpy (i2c->adap.name,"Conexant Digicolor I2C adapter" ,sizeof (i2c->adap.name)); i2c->adap.owner =THIS_MODULE ; i2c->adap.algo = &dc_i2c_algorithm;
drivers/i2c/busses/i2c-efm32.c +1 -1
@@ -318,7 +318,7 @@ static int efm32_i2c_probe(struct platform_device *pdev)platform_set_drvdata (pdev, ddata);init_completion (&ddata->done); -strlcpy (ddata->adapter.name, pdev->name,sizeof (ddata->adapter.name)); +strscpy (ddata->adapter.name, pdev->name,sizeof (ddata->adapter.name)); ddata->adapter.owner =THIS_MODULE ; ddata->adapter.algo = &efm32_i2c_algo; ddata->adapter.dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-eg20t.c +2 -1
@@ -772,7 +772,8 @@ static int pch_i2c_probe(struct pci_dev *pdev, pch_adap->owner =THIS_MODULE ; pch_adap->class =I2C_CLASS_HWMON ; -strlcpy (pch_adap->name,KBUILD_MODNAME ,sizeof (pch_adap->name)); +strscpy (pch_adap->name,KBUILD_MODNAME , +sizeof (pch_adap->name)); pch_adap->algo = &pch_algorithm; pch_adap->algo_data = &adap_info->pch_data[i];
drivers/i2c/busses/i2c-emev2.c +1 -1
@@ -371,7 +371,7 @@ static int em_i2c_probe(struct platform_device *pdev)if (IS_ERR (priv->base))return PTR_ERR (priv->base); -strlcpy (priv->adap.name,"EMEV2 I2C" ,sizeof (priv->adap.name)); +strscpy (priv->adap.name,"EMEV2 I2C" ,sizeof (priv->adap.name)); priv->sclk =devm_clk_get (&pdev->dev,"sclk" );if (IS_ERR (priv->sclk))
drivers/i2c/busses/i2c-exynos5.c +1 -1
@@ -745,7 +745,7 @@ static int exynos5_i2c_probe(struct platform_device *pdev)if (of_property_read_u32 (np,"clock-frequency" , &i2c->op_clock)) i2c->op_clock =I2C_MAX_STANDARD_MODE_FREQ ; -strlcpy (i2c->adap.name,"exynos5-i2c" ,sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"exynos5-i2c" ,sizeof (i2c->adap.name)); i2c->adap.owner =THIS_MODULE ; i2c->adap.algo = &exynos5_i2c_algorithm; i2c->adap.retries =3 ;
drivers/i2c/busses/i2c-gpio.c +1 -1
@@ -436,7 +436,7 @@ static int i2c_gpio_probe(struct platform_device *pdev) adap->owner =THIS_MODULE ;if (np) -strlcpy (adap->name,dev_name (dev),sizeof (adap->name)); +strscpy (adap->name,dev_name (dev),sizeof (adap->name));else snprintf (adap->name,sizeof (adap->name),"i2c-gpio%d" , pdev->id);
drivers/i2c/busses/i2c-highlander.c +1 -1
@@ -402,7 +402,7 @@ static int highlander_i2c_probe(struct platform_device *pdev)i2c_set_adapdata (adap, dev); adap->owner =THIS_MODULE ; adap->class =I2C_CLASS_HWMON ; -strlcpy (adap->name,"HL FPGA I2C adapter" ,sizeof (adap->name)); +strscpy (adap->name,"HL FPGA I2C adapter" ,sizeof (adap->name)); adap->algo = &highlander_i2c_algo; adap->dev.parent = &pdev->dev; adap->nr = pdev->id;
drivers/i2c/busses/i2c-hix5hd2.c +1 -1
@@ -425,7 +425,7 @@ static int hix5hd2_i2c_probe(struct platform_device *pdev) }clk_prepare_enable (priv->clk); -strlcpy (priv->adap.name,"hix5hd2-i2c" ,sizeof (priv->adap.name)); +strscpy (priv->adap.name,"hix5hd2-i2c" ,sizeof (priv->adap.name)); priv->dev = &pdev->dev; priv->adap.owner =THIS_MODULE ; priv->adap.algo = &hix5hd2_i2c_algorithm;
drivers/i2c/busses/i2c-i801.c +3 -3
@@ -1148,7 +1148,7 @@ static void dmi_check_onboard_device(u8 type, const char *name,memset (&info,0 ,sizeof (struct i2c_board_info )); info.addr = dmi_devices[i].i2c_addr; -strlcpy (info.type, dmi_devices[i].i2c_type,I2C_NAME_SIZE ); +strscpy (info.type, dmi_devices[i].i2c_type,I2C_NAME_SIZE );i2c_new_client_device (adap, &info);break ; }
@@ -1303,7 +1303,7 @@ static void register_dell_lis3lv02d_i2c_device(struct i801_priv *priv)memset (&info,0 ,sizeof (struct i2c_board_info )); info.addr = dell_lis3lv02d_devices[i].i2c_addr; -strlcpy (info.type,"lis3lv02d" ,I2C_NAME_SIZE ); +strscpy (info.type,"lis3lv02d" ,I2C_NAME_SIZE );i2c_new_client_device (&priv->adapter, &info); }
@@ -1319,7 +1319,7 @@ static void i801_probe_optional_slaves(struct i801_priv *priv)memset (&info,0 ,sizeof (struct i2c_board_info )); info.addr = apanel_addr; -strlcpy (info.type,"fujitsu_apanel" ,I2C_NAME_SIZE ); +strscpy (info.type,"fujitsu_apanel" ,I2C_NAME_SIZE );i2c_new_client_device (&priv->adapter, &info); }
drivers/i2c/busses/i2c-ibm_iic.c +1 -1
@@ -738,7 +738,7 @@ static int iic_probe(struct platform_device *ofdev) adap = &dev->adap; adap->dev.parent = &ofdev->dev; adap->dev.of_node =of_node_get (np); -strlcpy (adap->name,"IBM IIC" ,sizeof (adap->name)); +strscpy (adap->name,"IBM IIC" ,sizeof (adap->name));i2c_set_adapdata (adap, dev); adap->class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; adap->algo = &iic_algo;
drivers/i2c/busses/i2c-icy.c +1 -1
@@ -138,7 +138,7 @@ static int icy_probe(struct zorro_dev *z, i2c->adapter.owner =THIS_MODULE ;/* i2c->adapter.algo assigned by i2c_pcf_add_bus() */ i2c->adapter.algo_data = algo_data; -strlcpy (i2c->adapter.name,"ICY I2C Zorro adapter" , +strscpy (i2c->adapter.name,"ICY I2C Zorro adapter" ,sizeof (i2c->adapter.name)); if (!devm_request_mem_region(&z->dev,
drivers/i2c/busses/i2c-imx-lpi2c.c +1 -1
@@ -558,7 +558,7 @@ static int lpi2c_imx_probe(struct platform_device *pdev) lpi2c_imx->adapter.algo = &lpi2c_imx_algo; lpi2c_imx->adapter.dev.parent = &pdev->dev; lpi2c_imx->adapter.dev.of_node = pdev->dev.of_node; -strlcpy (lpi2c_imx->adapter.name, pdev->name, +strscpy (lpi2c_imx->adapter.name, pdev->name,sizeof (lpi2c_imx->adapter.name)); lpi2c_imx->clk =devm_clk_get (&pdev->dev,NULL );
drivers/i2c/busses/i2c-imx.c +2 -1
@@ -1148,7 +1148,8 @@ static int i2c_imx_probe(struct platform_device *pdev)platform_get_device_id (pdev)->driver_data;/* Setup i2c_imx driver structure */ -strlcpy (i2c_imx->adapter.name, pdev->name,sizeof (i2c_imx->adapter.name)); +strscpy (i2c_imx->adapter.name, pdev->name, +sizeof (i2c_imx->adapter.name)); i2c_imx->adapter.owner =THIS_MODULE ; i2c_imx->adapter.algo = &i2c_imx_algo; i2c_imx->adapter.dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-lpc2k.c +1 -1
@@ -417,7 +417,7 @@ static int i2c_lpc2k_probe(struct platform_device *pdev)i2c_set_adapdata (&i2c->adap, i2c); i2c->adap.owner =THIS_MODULE ; -strlcpy (i2c->adap.name,"LPC2K I2C adapter" ,sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"LPC2K I2C adapter" ,sizeof (i2c->adap.name)); i2c->adap.algo = &i2c_lpc2k_algorithm; i2c->adap.dev.parent = &pdev->dev; i2c->adap.dev.of_node = pdev->dev.of_node;
drivers/i2c/busses/i2c-meson.c +1 -2
@@ -451,8 +451,7 @@ static int meson_i2c_probe(struct platform_device *pdev)return ret; } -strlcpy (i2c->adap.name,"Meson I2C adapter" , -sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"Meson I2C adapter" ,sizeof (i2c->adap.name)); i2c->adap.owner =THIS_MODULE ; i2c->adap.algo = &meson_i2c_algorithm; i2c->adap.dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-mt65xx.c +1 -1
@@ -1232,7 +1232,7 @@ static int mtk_i2c_probe(struct platform_device *pdev) clk = i2c->clk_pmic; } -strlcpy (i2c->adap.name,I2C_DRV_NAME ,sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,I2C_DRV_NAME ,sizeof (i2c->adap.name)); ret =mtk_i2c_set_speed (i2c,clk_get_rate (clk));if (ret) {
drivers/i2c/busses/i2c-mt7621.c +1 -1
@@ -314,7 +314,7 @@ static int mtk_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev;i2c_set_adapdata (adap, i2c); adap->dev.of_node = pdev->dev.of_node; -strlcpy (adap->name,dev_name (&pdev->dev),sizeof (adap->name)); +strscpy (adap->name,dev_name (&pdev->dev),sizeof (adap->name));platform_set_drvdata (pdev, i2c);
drivers/i2c/busses/i2c-mv64xxx.c +1 -1
@@ -889,7 +889,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)if (IS_ERR (drv_data->reg_base))return PTR_ERR (drv_data->reg_base); -strlcpy (drv_data->adapter.name,MV64XXX_I2C_CTLR_NAME " adapter" , +strscpy (drv_data->adapter.name,MV64XXX_I2C_CTLR_NAME " adapter" ,sizeof (drv_data->adapter.name));init_waitqueue_head (&drv_data->waitq);
drivers/i2c/busses/i2c-mxs.c +1 -1
@@ -854,7 +854,7 @@ static int mxs_i2c_probe(struct platform_device *pdev)return err; adap = &i2c->adapter; -strlcpy (adap->name,"MXS I2C adapter" ,sizeof (adap->name)); +strscpy (adap->name,"MXS I2C adapter" ,sizeof (adap->name)); adap->owner =THIS_MODULE ; adap->algo = &mxs_i2c_algo; adap->quirks = &mxs_i2c_quirks;
drivers/i2c/busses/i2c-nvidia-gpu.c +2 -2
@@ -270,7 +270,7 @@ static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq)if (!i2cd->gpu_ccgx_ucsi)return -ENOMEM ; -strlcpy (i2cd->gpu_ccgx_ucsi->type,"ccgx-ucsi" , +strscpy (i2cd->gpu_ccgx_ucsi->type,"ccgx-ucsi" ,sizeof (i2cd->gpu_ccgx_ucsi->type)); i2cd->gpu_ccgx_ucsi->addr =0x8 ; i2cd->gpu_ccgx_ucsi->irq = irq;
@@ -315,7 +315,7 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)i2c_set_adapdata (&i2cd->adapter, i2cd); i2cd->adapter.owner =THIS_MODULE ; -strlcpy (i2cd->adapter.name,"NVIDIA GPU I2C adapter" , +strscpy (i2cd->adapter.name,"NVIDIA GPU I2C adapter" ,sizeof (i2cd->adapter.name)); i2cd->adapter.algo = &gpu_i2c_algorithm; i2cd->adapter.quirks = &gpu_i2c_quirks;
drivers/i2c/busses/i2c-omap.c +1 -1
@@ -1488,7 +1488,7 @@ omap_i2c_probe(struct platform_device *pdev)i2c_set_adapdata (adap, omap); adap->owner =THIS_MODULE ; adap->class =I2C_CLASS_DEPRECATED ; -strlcpy (adap->name,"OMAP I2C adapter" ,sizeof (adap->name)); +strscpy (adap->name,"OMAP I2C adapter" ,sizeof (adap->name)); adap->algo = &omap_i2c_algo; adap->quirks = &omap_i2c_quirks; adap->dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-opal.c +2 -2
@@ -220,9 +220,9 @@ static int i2c_opal_probe(struct platform_device *pdev) adapter->dev.of_node =of_node_get (pdev->dev.of_node); pname =of_get_property (pdev->dev.of_node,"ibm,port-name" ,NULL );if (pname) -strlcpy (adapter->name, pname,sizeof (adapter->name)); +strscpy (adapter->name, pname,sizeof (adapter->name));else -strlcpy (adapter->name,"opal" ,sizeof (adapter->name)); +strscpy (adapter->name,"opal" ,sizeof (adapter->name));platform_set_drvdata (pdev, adapter); rc =i2c_add_adapter (adapter);
drivers/i2c/busses/i2c-parport.c +1 -1
@@ -298,7 +298,7 @@ static void i2c_parport_attach(struct parport *port)/* Fill the rest of the structure */ adapter->adapter.owner =THIS_MODULE ; adapter->adapter.class =I2C_CLASS_HWMON ; -strlcpy (adapter->adapter.name,"Parallel port adapter" , +strscpy (adapter->adapter.name,"Parallel port adapter" ,sizeof (adapter->adapter.name)); adapter->algo_data = parport_algo_data;/* Slow down if we can't sense SCL */
drivers/i2c/busses/i2c-pxa.c +1 -1
@@ -1463,7 +1463,7 @@ static int i2c_pxa_probe(struct platform_device *dev)spin_lock_init (&i2c->lock);init_waitqueue_head (&i2c->wait); -strlcpy (i2c->adap.name,"pxa_i2c-i2c" ,sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"pxa_i2c-i2c" ,sizeof (i2c->adap.name)); i2c->clk =devm_clk_get (&dev->dev,NULL );if (IS_ERR (i2c->clk)) {
drivers/i2c/busses/i2c-qcom-geni.c +1 -1
@@ -556,7 +556,7 @@ static int geni_i2c_probe(struct platform_device *pdev)i2c_set_adapdata (&gi2c->adap, gi2c); gi2c->adap.dev.parent = dev; gi2c->adap.dev.of_node = dev->of_node; -strlcpy (gi2c->adap.name,"Geni-I2C" ,sizeof (gi2c->adap.name)); +strscpy (gi2c->adap.name,"Geni-I2C" ,sizeof (gi2c->adap.name)); ret =geni_icc_get (&gi2c->se,"qup-memory" );if (ret)
drivers/i2c/busses/i2c-qup.c +1 -1
@@ -1877,7 +1877,7 @@ static int qup_i2c_probe(struct platform_device *pdev) qup->adap.dev.of_node = pdev->dev.of_node; qup->is_last = true; -strlcpy (qup->adap.name,"QUP I2C adapter" ,sizeof (qup->adap.name)); +strscpy (qup->adap.name,"QUP I2C adapter" ,sizeof (qup->adap.name));pm_runtime_set_autosuspend_delay (qup->dev,MSEC_PER_SEC );pm_runtime_use_autosuspend (qup->dev);
drivers/i2c/busses/i2c-rcar.c +1 -1
@@ -963,7 +963,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) adap->bus_recovery_info = &rcar_i2c_bri; adap->quirks = &rcar_i2c_quirks;i2c_set_adapdata (adap, priv); -strlcpy (adap->name, pdev->name,sizeof (adap->name)); +strscpy (adap->name, pdev->name,sizeof (adap->name));/* Init DMA */ sg_init_table (&priv->sg,1 );
drivers/i2c/busses/i2c-riic.c +1 -1
@@ -427,7 +427,7 @@ static int riic_i2c_probe(struct platform_device *pdev) adap = &riic->adapter;i2c_set_adapdata (adap, riic); -strlcpy (adap->name,"Renesas RIIC adapter" ,sizeof (adap->name)); +strscpy (adap->name,"Renesas RIIC adapter" ,sizeof (adap->name)); adap->owner =THIS_MODULE ; adap->algo = &riic_algo; adap->dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-rk3x.c +1 -1
@@ -1240,7 +1240,7 @@ static int rk3x_i2c_probe(struct platform_device *pdev)/* use common interface to get I2C timing properties */ i2c_parse_fw_timings (&pdev->dev, &i2c->t, true); -strlcpy (i2c->adap.name,"rk3x-i2c" ,sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"rk3x-i2c" ,sizeof (i2c->adap.name)); i2c->adap.owner =THIS_MODULE ; i2c->adap.algo = &rk3x_i2c_algorithm; i2c->adap.retries =3 ;
drivers/i2c/busses/i2c-s3c2410.c +1 -1
@@ -1076,7 +1076,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)else s3c24xx_i2c_parse_dt (pdev->dev.of_node, i2c); -strlcpy (i2c->adap.name,"s3c2410-i2c" ,sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"s3c2410-i2c" ,sizeof (i2c->adap.name)); i2c->adap.owner =THIS_MODULE ; i2c->adap.algo = &s3c24xx_i2c_algorithm; i2c->adap.retries =2 ;
drivers/i2c/busses/i2c-sh_mobile.c +1 -1
@@ -930,7 +930,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev) adap->nr = dev->id; adap->dev.of_node = dev->dev.of_node; -strlcpy (adap->name, dev->name,sizeof (adap->name)); +strscpy (adap->name, dev->name,sizeof (adap->name));spin_lock_init (&pd->lock);init_waitqueue_head (&pd->wait);
drivers/i2c/busses/i2c-simtec.c +1 -1
@@ -99,7 +99,7 @@ static int simtec_i2c_probe(struct platform_device *dev) pd->adap.algo_data = &pd->bit; pd->adap.dev.parent = &dev->dev; -strlcpy (pd->adap.name,"Simtec I2C" ,sizeof (pd->adap.name)); +strscpy (pd->adap.name,"Simtec I2C" ,sizeof (pd->adap.name)); pd->bit.data = pd; pd->bit.setsda = simtec_i2c_setsda;
drivers/i2c/busses/i2c-sirf.c +1 -1
@@ -332,7 +332,7 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->nr = pdev->id; -strlcpy (adap->name,"sirfsoc-i2c" ,sizeof (adap->name)); +strscpy (adap->name,"sirfsoc-i2c" ,sizeof (adap->name));platform_set_drvdata (pdev, adap);init_completion (&siic->done);
drivers/i2c/busses/i2c-stu300.c +1 -1
@@ -905,7 +905,7 @@ static int stu300_probe(struct platform_device *pdev) adap->owner =THIS_MODULE ;/* DDC class but actually often used for more generic I2C */ adap->class =I2C_CLASS_DEPRECATED ; -strlcpy (adap->name,"ST Microelectronics DDC I2C adapter" , +strscpy (adap->name,"ST Microelectronics DDC I2C adapter" ,sizeof (adap->name)); adap->nr = bus_nr; adap->algo = &stu300_algo;
drivers/i2c/busses/i2c-sun6i-p2wi.c +1 -1
@@ -234,7 +234,7 @@ static int p2wi_probe(struct platform_device *pdev)if (IS_ERR (p2wi->regs))return PTR_ERR (p2wi->regs); -strlcpy (p2wi->adapter.name, pdev->name,sizeof (p2wi->adapter.name)); +strscpy (p2wi->adapter.name, pdev->name,sizeof (p2wi->adapter.name)); irq =platform_get_irq (pdev,0 );if (irq <0 )return irq;
drivers/i2c/busses/i2c-taos-evm.c +1 -1
@@ -239,7 +239,7 @@ static int taos_connect(struct serio *serio, struct serio_driver *drv)dev_err (&serio->dev,"TAOS EVM identification failed\n" ); goto exit_close; } -strlcpy (adapter->name, name,sizeof (adapter->name)); +strscpy (adapter->name, name,sizeof (adapter->name));/* Turn echo off for better performance */ taos->state =TAOS_STATE_EOFF ;
drivers/i2c/busses/i2c-tegra-bpmp.c +1 -1
@@ -308,7 +308,7 @@ static int tegra_bpmp_i2c_probe(struct platform_device *pdev)i2c_set_adapdata (&i2c->adapter, i2c); i2c->adapter.owner =THIS_MODULE ; -strlcpy (i2c->adapter.name,"Tegra BPMP I2C adapter" , +strscpy (i2c->adapter.name,"Tegra BPMP I2C adapter" ,sizeof (i2c->adapter.name)); i2c->adapter.algo = &tegra_bpmp_i2c_algo; i2c->adapter.dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-tegra.c +1 -1
@@ -1774,7 +1774,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)if (i2c_dev->hw->supports_bus_clear) i2c_dev->adapter.bus_recovery_info = &tegra_i2c_recovery_info; -strlcpy (i2c_dev->adapter.name,dev_name (i2c_dev->dev), +strscpy (i2c_dev->adapter.name,dev_name (i2c_dev->dev),sizeof (i2c_dev->adapter.name)); err =i2c_add_numbered_adapter (&i2c_dev->adapter);
drivers/i2c/busses/i2c-uniphier-f.c +1 -1
@@ -564,7 +564,7 @@ static int uniphier_fi2c_probe(struct platform_device *pdev) priv->adap.algo = &uniphier_fi2c_algo; priv->adap.dev.parent = dev; priv->adap.dev.of_node = dev->of_node; -strlcpy (priv->adap.name,"UniPhier FI2C" ,sizeof (priv->adap.name)); +strscpy (priv->adap.name,"UniPhier FI2C" ,sizeof (priv->adap.name)); priv->adap.bus_recovery_info = &uniphier_fi2c_bus_recovery_info;i2c_set_adapdata (&priv->adap, priv);platform_set_drvdata (pdev, priv);
drivers/i2c/busses/i2c-uniphier.c +1 -1
@@ -358,7 +358,7 @@ static int uniphier_i2c_probe(struct platform_device *pdev) priv->adap.algo = &uniphier_i2c_algo; priv->adap.dev.parent = dev; priv->adap.dev.of_node = dev->of_node; -strlcpy (priv->adap.name,"UniPhier I2C" ,sizeof (priv->adap.name)); +strscpy (priv->adap.name,"UniPhier I2C" ,sizeof (priv->adap.name)); priv->adap.bus_recovery_info = &uniphier_i2c_bus_recovery_info;i2c_set_adapdata (&priv->adap, priv);platform_set_drvdata (pdev, priv);
drivers/i2c/busses/i2c-versatile.c +2 -1
@@ -79,7 +79,8 @@ static int i2c_versatile_probe(struct platform_device *dev)writel (SCL |SDA , i2c->base +I2C_CONTROLS ); i2c->adap.owner =THIS_MODULE ; -strlcpy (i2c->adap.name,"Versatile I2C adapter" ,sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"Versatile I2C adapter" , +sizeof (i2c->adap.name)); i2c->adap.algo_data = &i2c->algo; i2c->adap.dev.parent = &dev->dev; i2c->adap.dev.of_node = dev->dev.of_node;
drivers/i2c/busses/i2c-wmt.c +1 -1
@@ -413,7 +413,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev); -strlcpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name)); +strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name)); adap->owner =THIS_MODULE ; adap->algo = &wmt_i2c_algo; adap->dev.parent = &pdev->dev;
drivers/i2c/busses/i2c-zx2967.c +1 -2
@@ -557,8 +557,7 @@ static int zx2967_i2c_probe(struct platform_device *pdev) }i2c_set_adapdata (&i2c->adap, i2c); -strlcpy (i2c->adap.name,"zx2967 i2c adapter" , -sizeof (i2c->adap.name)); +strscpy (i2c->adap.name,"zx2967 i2c adapter" ,sizeof (i2c->adap.name)); i2c->adap.algo = &zx2967_i2c_algo; i2c->adap.quirks = &zx2967_i2c_quirks; i2c->adap.nr = pdev->id;
drivers/i2c/i2c-core-base.c +1 -1
@@ -885,7 +885,7 @@ i2c_new_client_device(struct i2c_adapter *adap, struct i2c_board_info const *inf client->init_irq =i2c_dev_irq_from_resources (info->resources, info->num_resources); -strlcpy (client->name, info->type,sizeof (client->name)); +strscpy (client->name, info->type,sizeof (client->name)); status =i2c_check_addr_validity (client->addr, client->flags);if (status) {
drivers/i2c/i2c-smbus.c +1 -1
@@ -390,7 +390,7 @@ void i2c_register_spd(struct i2c_adapter *adap)unsigned short addr_list[2 ];memset (&info,0 ,sizeof (struct i2c_board_info )); -strlcpy (info.type, name,I2C_NAME_SIZE ); +strscpy (info.type, name,I2C_NAME_SIZE ); addr_list[0 ] =0x50 + n; addr_list[1 ] =I2C_CLIENT_END ;
drivers/idle/intel_idle.c +1 -1
@@ -1244,7 +1244,7 @@ static void __init intel_idle_init_cstates_acpi(struct cpuidle_driver *drv) state = &drv->states[drv->state_count++];snprintf (state->name,CPUIDLE_NAME_LEN ,"C%d_ACPI" , cstate); -strlcpy (state->desc, cx->desc,CPUIDLE_DESC_LEN ); +strscpy (state->desc, cx->desc,CPUIDLE_DESC_LEN ); state->exit_latency = cx->latency;/* * For C1-type C-states use the same number for both the exit
drivers/iio/common/st_sensors/st_sensors_core.c +1 -1
@@ -353,7 +353,7 @@ void st_sensors_dev_name_probe(struct device *dev, char *name, int len)return ;/* The name from the match takes precedence if present */ -strlcpy (name, match, len); +strscpy (name, match, len); }EXPORT_SYMBOL (st_sensors_dev_name_probe);
drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c +2 -2
@@ -65,7 +65,7 @@ static int asus_acpi_get_sensor_info(struct acpi_device *adev, sub_elem = &elem->package.elements[j];if (sub_elem->type ==ACPI_TYPE_STRING ) -strlcpy (info->type, sub_elem->string.pointer, +strscpy (info->type, sub_elem->string.pointer,sizeof (info->type));else if (sub_elem->type ==ACPI_TYPE_INTEGER ) {if (sub_elem->integer.value != client->addr) {
@@ -159,7 +159,7 @@ int inv_mpu_acpi_create_mux_client(struct i2c_client *client)char *name; info.addr = secondary; -strlcpy (info.type,dev_name (&adev->dev), +strscpy (info.type,dev_name (&adev->dev),sizeof (info.type)); name =strchr (info.type,':' );if (name)
drivers/infiniband/core/cma_configfs.c +1 -1
@@ -299,7 +299,7 @@ static struct config_group *make_cma_dev(struct config_group *group, goto fail; } -strlcpy (cma_dev_group->name, name,sizeof (cma_dev_group->name)); +strscpy (cma_dev_group->name, name,sizeof (cma_dev_group->name));config_group_init_type_name (&cma_dev_group->ports_group,"ports" , &cma_ports_group_type);
drivers/infiniband/core/device.c +2 -2
@@ -420,7 +420,7 @@ int ib_device_rename(struct ib_device *ibdev, const char *name)return ret; } -strlcpy (ibdev->name, name,IB_DEVICE_NAME_MAX ); +strscpy (ibdev->name, name,IB_DEVICE_NAME_MAX ); ret =rename_compat_devs (ibdev);downgrade_write (&devices_rwsem);
@@ -1165,7 +1165,7 @@ static int assign_name(struct ib_device *device, const char *name) ret = -ENFILE ; goto out; } -strlcpy (device->name,dev_name (&device->dev),IB_DEVICE_NAME_MAX ); +strscpy (device->name,dev_name (&device->dev),IB_DEVICE_NAME_MAX ); ret =xa_alloc_cyclic (&devices, &device->index, device, xa_limit_31b, &last_id,GFP_KERNEL );
drivers/infiniband/hw/bnxt_re/main.c +1 -1
@@ -691,7 +691,7 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev)/* ib device init */ ibdev->node_type =RDMA_NODE_IB_CA ; -strlcpy (ibdev->node_desc,BNXT_RE_DESC " HCA" , +strscpy (ibdev->node_desc,BNXT_RE_DESC " HCA" ,strlen (BNXT_RE_DESC ) +5 ); ibdev->phys_port_cnt =1 ;
drivers/infiniband/hw/efa/efa_main.c +2 -2
@@ -209,10 +209,10 @@ static void efa_set_host_info(struct efa_dev *dev)if (!hinf)return ; -strlcpy (hinf->os_dist_str,utsname ()->release, +strscpy (hinf->os_dist_str,utsname ()->release,min (sizeof (hinf->os_dist_str),sizeof (utsname ()->release))); hinf->os_type =EFA_ADMIN_OS_LINUX ; -strlcpy (hinf->kernel_ver_str,utsname ()->version, +strscpy (hinf->kernel_ver_str,utsname ()->version,min (sizeof (hinf->kernel_ver_str),sizeof (utsname ()->version))); hinf->kernel_ver =LINUX_VERSION_CODE ;EFA_SET (&hinf->driver_ver,EFA_ADMIN_HOST_INFO_DRIVER_MAJOR ,0 );
drivers/infiniband/hw/hfi1/file_ops.c +1 -1
@@ -1004,7 +1004,7 @@ static int allocate_ctxt(struct hfi1_filedata *fd, struct hfi1_devdata *dd, uctxt->userversion = uinfo->userversion; uctxt->flags = hfi1_cap_mask;/* save current flag state */ init_waitqueue_head (&uctxt->wait); -strlcpy (uctxt->comm, current->comm,sizeof (uctxt->comm)); +strscpy (uctxt->comm, current->comm,sizeof (uctxt->comm));memcpy (uctxt->uuid, uinfo->uuid,sizeof (uctxt->uuid)); uctxt->jkey =generate_jkey (current_uid ()); hfi1_stats.sps_ctxts++;
drivers/infiniband/hw/hfi1/verbs.c +1 -1
@@ -1843,7 +1843,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)ib_set_device_ops (ibdev, &hfi1_dev_ops); -strlcpy (ibdev->node_desc,init_utsname ()->nodename, +strscpy (ibdev->node_desc,init_utsname ()->nodename,sizeof (ibdev->node_desc));/*
drivers/infiniband/hw/mthca/mthca_cmd.c +2 -1
@@ -1252,7 +1252,8 @@ static void get_board_id(void *vsd, char *board_id)if (be16_to_cpup (vsd +VSD_OFFSET_SIG1 ) ==VSD_SIGNATURE_TOPSPIN &&be16_to_cpup (vsd +VSD_OFFSET_SIG2 ) ==VSD_SIGNATURE_TOPSPIN ) { -strlcpy (board_id, vsd +VSD_OFFSET_TS_BOARD_ID ,MTHCA_BOARD_ID_LEN ); +strscpy (board_id, vsd +VSD_OFFSET_TS_BOARD_ID , +MTHCA_BOARD_ID_LEN ); }else {/* * The board ID is a string but the firmware byte
drivers/infiniband/hw/ocrdma/ocrdma_hw.c +1 -1
@@ -1363,7 +1363,7 @@ static int ocrdma_mbx_get_ctrl_attribs(struct ocrdma_dev *dev) dev->hba_port_num = (hba_attribs->ptpnum_maxdoms_hbast_cv &OCRDMA_HBA_ATTRB_PTNUM_MASK ) >>OCRDMA_HBA_ATTRB_PTNUM_SHIFT ; -strlcpy (dev->model_number, +strscpy (dev->model_number, hba_attribs->controller_model_number,sizeof (dev->model_number)); }
drivers/infiniband/hw/qib/qib_file_ops.c +1 -1
@@ -1321,7 +1321,7 @@ static int setup_ctxt(struct qib_pportdata *ppd, int ctxt, rcd->tid_pg_list = ptmp; rcd->pid = current->pid;init_waitqueue_head (&dd->rcd[ctxt]->wait); -strlcpy (rcd->comm, current->comm,sizeof (rcd->comm)); +strscpy (rcd->comm, current->comm,sizeof (rcd->comm));ctxt_fp (fp) = rcd; qib_stats.sps_ctxts++; dd->freectxts--;
drivers/infiniband/hw/qib/qib_iba7322.c +1 -1
@@ -2146,7 +2146,7 @@ static void qib_7322_handle_hwerrors(struct qib_devdata *dd, char *msg,if (hwerrs &HWE_MASK (PowerOnBISTFailed)) { isfatal =1 ; -strlcpy (msg, +strscpy (msg,"[Memory BIST test failed, InfiniPath hardware unusable]" , msgl);/* ignore from now on, so disable until driver reloaded */
drivers/infiniband/sw/rxe/rxe_verbs.c +1 -1
@@ -1120,7 +1120,7 @@ int rxe_register_device(struct rxe_dev *rxe, const char *ibdev_name)struct crypto_shash *tfm;u64 dma_mask; -strlcpy (dev->node_desc,"rxe" ,sizeof (dev->node_desc)); +strscpy (dev->node_desc,"rxe" ,sizeof (dev->node_desc)); dev->node_type =RDMA_NODE_IB_CA ; dev->phys_port_cnt =1 ;
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +2 -2
@@ -65,10 +65,10 @@ static void ipoib_get_drvinfo(struct net_device *netdev,ib_get_device_fw_str (priv->ca, drvinfo->fw_version); -strlcpy (drvinfo->bus_info,dev_name (priv->ca->dev.parent), +strscpy (drvinfo->bus_info,dev_name (priv->ca->dev.parent),sizeof (drvinfo->bus_info)); -strlcpy (drvinfo->driver,"ib_ipoib" ,sizeof (drvinfo->driver)); +strscpy (drvinfo->driver,"ib_ipoib" ,sizeof (drvinfo->driver)); } static int ipoib_get_coalesce(struct net_device *dev,
drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c +3 -2
@@ -124,8 +124,9 @@ static struct vnic_stats vnic_gstrings_stats[] = {static void vnic_get_drvinfo (struct net_device *netdev,struct ethtool_drvinfo *drvinfo) { -strlcpy (drvinfo->driver, opa_vnic_driver_name,sizeof (drvinfo->driver)); -strlcpy (drvinfo->bus_info,dev_name (netdev->dev.parent), +strscpy (drvinfo->driver, opa_vnic_driver_name, +sizeof (drvinfo->driver)); +strscpy (drvinfo->bus_info,dev_name (netdev->dev.parent),sizeof (drvinfo->bus_info)); }
drivers/infiniband/ulp/rtrs/rtrs-clt.c +3 -3
@@ -1441,7 +1441,7 @@ static struct rtrs_clt_sess *alloc_sess(struct rtrs_clt *clt,if (path->src)memcpy (&sess->s.src_addr, path->src,rdma_addr_size ((struct sockaddr *)path->src)); -strlcpy (sess->s.sessname, clt->sessname,sizeof (sess->s.sessname)); +strscpy (sess->s.sessname, clt->sessname,sizeof (sess->s.sessname)); sess->s.con_num = con_num; sess->clt = clt; sess->max_pages_per_mr = max_segments * max_segment_size >>12 ;
@@ -2565,7 +2565,7 @@ static struct rtrs_clt *alloc_clt(const char *sessname, size_t paths_num, clt->priv = priv; clt->link_ev = link_ev; clt->mp_policy =MP_POLICY_MIN_INFLIGHT ; -strlcpy (clt->sessname, sessname,sizeof (clt->sessname)); +strscpy (clt->sessname, sessname,sizeof (clt->sessname));init_waitqueue_head (&clt->permits_wait);mutex_init (&clt->paths_ev_mutex);mutex_init (&clt->paths_mutex);
@@ -2916,7 +2916,7 @@ int rtrs_clt_query(struct rtrs_clt *clt, struct rtrs_attrs *attr) attr->queue_depth = clt->queue_depth; attr->max_io_size = clt->max_io_size; attr->sess_kobj = &clt->dev.kobj; -strlcpy (attr->sessname, clt->sessname,sizeof (attr->sessname)); +strscpy (attr->sessname, clt->sessname,sizeof (attr->sessname));return 0 ; }
drivers/infiniband/ulp/rtrs/rtrs-srv.c +3 -3
@@ -800,7 +800,7 @@ static int process_info_req(struct rtrs_srv_con *con, rwr =kcalloc (sess->mrs_num,sizeof (*rwr),GFP_KERNEL );if (unlikely (!rwr))return -ENOMEM ; -strlcpy (sess->s.sessname, msg->sessname,sizeof (sess->s.sessname)); +strscpy (sess->s.sessname, msg->sessname,sizeof (sess->s.sessname)); tx_sz =sizeof (*rsp); tx_sz +=sizeof (rsp->desc[0 ]) * sess->mrs_num;
@@ -1282,8 +1282,8 @@ int rtrs_srv_get_sess_name(struct rtrs_srv *srv, char *sessname, size_t len)list_for_each_entry (sess, &srv->paths_list, s.entry) {if (sess->state !=RTRS_SRV_CONNECTED )continue ; -strlcpy (sessname, sess->s.sessname, -min_t (size_t,sizeof (sess->s.sessname), len)); +strscpy (sessname, sess->s.sessname, +min_t (size_t,sizeof (sess->s.sessname), len)); err =0 ;break ; }
drivers/infiniband/ulp/srpt/ib_srpt.c +1 -1
@@ -2299,7 +2299,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev, goto free_recv_ring; } -strlcpy (ch->sess_name, src_addr,sizeof (ch->sess_name)); +strscpy (ch->sess_name, src_addr,sizeof (ch->sess_name));snprintf (i_port_id,sizeof (i_port_id),"0x%016llx%016llx" ,be64_to_cpu (*(__be64 *)nexus->i_port_id),be64_to_cpu (*(__be64 *)(nexus->i_port_id +8 )));
drivers/input/keyboard/lkkbd.c +4 -4
@@ -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 <[email protected]>\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 +2 -1
@@ -485,7 +485,8 @@ 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
@@ -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
@@ -714,8 +714,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
@@ -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) {
drivers/input/mouse/vsxxxaa.c +2 -2
@@ -138,12 +138,12 @@ static void vsxxxaa_detection_done(struct vsxxxaa *mouse) {switch (mouse->type) {case 0x02 : -strlcpy (mouse->name,"DEC VSXXX-AA/-GA mouse" , +strscpy (mouse->name,"DEC VSXXX-AA/-GA mouse" ,sizeof (mouse->name));break ;case 0x04 : -strlcpy (mouse->name,"DEC VSXXX-AB digitizer" , +strscpy (mouse->name,"DEC VSXXX-AB digitizer" ,sizeof (mouse->name));break ;
drivers/input/rmi4/rmi_f03.c +1 -1
@@ -181,7 +181,7 @@ static int rmi_f03_register_pt(struct f03_data *f03) serio->close = rmi_f03_pt_close; serio->port_data = f03; -strlcpy (serio->name,"RMI4 PS/2 pass-through" ,sizeof (serio->name)); +strscpy (serio->name,"RMI4 PS/2 pass-through" ,sizeof (serio->name));snprintf (serio->phys,sizeof (serio->phys),"%s/serio0" ,dev_name (&f03->fn->dev)); serio->dev.parent = &f03->fn->dev;
drivers/input/rmi4/rmi_f54.c +4 -4
@@ -384,8 +384,8 @@ static int rmi_f54_vidioc_querycap(struct file *file, void *priv, {struct f54_data *f54 =video_drvdata (file); -strlcpy (cap->driver,F54_NAME ,sizeof (cap->driver)); -strlcpy (cap->card,SYNAPTICS_INPUT_DEVICE_NAME ,sizeof (cap->card)); +strscpy (cap->driver,F54_NAME ,sizeof (cap->driver)); +strscpy (cap->card,SYNAPTICS_INPUT_DEVICE_NAME ,sizeof (cap->card));snprintf (cap->bus_info,sizeof (cap->bus_info),"rmi4:%s" ,dev_name (&f54->fn->dev));
@@ -404,7 +404,7 @@ static int rmi_f54_vidioc_enum_input(struct file *file, void *priv, i->type =V4L2_INPUT_TYPE_TOUCH ; -strlcpy (i->name, rmi_f54_report_type_names[reptype],sizeof (i->name)); +strscpy (i->name, rmi_f54_report_type_names[reptype],sizeof (i->name));return 0 ; }
@@ -690,7 +690,7 @@ static int rmi_f54_probe(struct rmi_function *fn)rmi_f54_set_input (f54,0 );/* register video device */ -strlcpy (f54->v4l2.name,F54_NAME ,sizeof (f54->v4l2.name)); +strscpy (f54->v4l2.name,F54_NAME ,sizeof (f54->v4l2.name)); ret =v4l2_device_register (&fn->dev, &f54->v4l2);if (ret) {dev_err (&fn->dev,"Unable to register video dev.\n" );
drivers/input/serio/altera_ps2.c +2 -2
@@ -110,8 +110,8 @@ static int altera_ps2_probe(struct platform_device *pdev) serio->write = altera_ps2_write; serio->open = altera_ps2_open; serio->close = altera_ps2_close; -strlcpy (serio->name,dev_name (&pdev->dev),sizeof (serio->name)); -strlcpy (serio->phys,dev_name (&pdev->dev),sizeof (serio->phys)); +strscpy (serio->name,dev_name (&pdev->dev),sizeof (serio->name)); +strscpy (serio->phys,dev_name (&pdev->dev),sizeof (serio->phys)); serio->port_data = ps2if; serio->dev.parent = &pdev->dev; ps2if->io = serio;
drivers/input/serio/ambakmi.c +2 -2
@@ -126,8 +126,8 @@ static int amba_kmi_probe(struct amba_device *dev, io->write = amba_kmi_write; io->open = amba_kmi_open; io->close = amba_kmi_close; -strlcpy (io->name,dev_name (&dev->dev),sizeof (io->name)); -strlcpy (io->phys,dev_name (&dev->dev),sizeof (io->phys)); +strscpy (io->name,dev_name (&dev->dev),sizeof (io->name)); +strscpy (io->phys,dev_name (&dev->dev),sizeof (io->phys)); io->port_data = kmi; io->dev.parent = &dev->dev;
drivers/input/serio/ams_delta_serio.c +3 -2
@@ -159,8 +159,9 @@ static int ams_delta_serio_init(struct platform_device *pdev) serio->id.type =SERIO_8042 ; serio->open = ams_delta_serio_open; serio->close = ams_delta_serio_close; -strlcpy (serio->name,"AMS DELTA keyboard adapter" ,sizeof (serio->name)); -strlcpy (serio->phys,dev_name (&pdev->dev),sizeof (serio->phys)); +strscpy (serio->name,"AMS DELTA keyboard adapter" , +sizeof (serio->name)); +strscpy (serio->phys,dev_name (&pdev->dev),sizeof (serio->phys)); serio->dev.parent = &pdev->dev; serio->port_data = priv;
drivers/input/serio/apbps2.c +1 -1
@@ -177,7 +177,7 @@ static int apbps2_of_probe(struct platform_device *ofdev) priv->io->close = apbps2_close; priv->io->write = apbps2_write; priv->io->port_data = priv; -strlcpy (priv->io->name,"APBPS2 PS/2" ,sizeof (priv->io->name)); +strscpy (priv->io->name,"APBPS2 PS/2" ,sizeof (priv->io->name));snprintf (priv->io->phys,sizeof (priv->io->phys),"apbps2_%d" , apbps2_idx++);
drivers/input/serio/ct82c710.c +1 -1
@@ -170,7 +170,7 @@ static int ct82c710_probe(struct platform_device *dev) ct82c710_port->open = ct82c710_open; ct82c710_port->close = ct82c710_close; ct82c710_port->write = ct82c710_write; -strlcpy (ct82c710_port->name,"C&T 82c710 mouse port" , +strscpy (ct82c710_port->name,"C&T 82c710 mouse port" ,sizeof (ct82c710_port->name));snprintf (ct82c710_port->phys,sizeof (ct82c710_port->phys),"isa%16llx/serio0" , (unsigned long long )CT82C710_DATA );
drivers/input/serio/gscps2.c +1 -1
@@ -357,7 +357,7 @@ static int __init gscps2_probe(struct parisc_device *dev)snprintf (serio->name,sizeof (serio->name),"gsc-ps2-%s" , (ps2port->id ==GSC_ID_KEYBOARD ) ?"keyboard" :"mouse" ); -strlcpy (serio->phys,dev_name (&dev->dev),sizeof (serio->phys)); +strscpy (serio->phys,dev_name (&dev->dev),sizeof (serio->phys)); serio->id.type =SERIO_8042 ; serio->write = gscps2_write; serio->open = gscps2_open;
drivers/input/serio/hyperv-keyboard.c +2 -2
@@ -334,9 +334,9 @@ static int hv_kbd_probe(struct hv_device *hv_dev, hv_serio->dev.parent = &hv_dev->device; hv_serio->id.type =SERIO_8042_XL ; hv_serio->port_data = kbd_dev; -strlcpy (hv_serio->name,dev_name (&hv_dev->device), +strscpy (hv_serio->name,dev_name (&hv_dev->device),sizeof (hv_serio->name)); -strlcpy (hv_serio->phys,dev_name (&hv_dev->device), +strscpy (hv_serio->phys,dev_name (&hv_dev->device),sizeof (hv_serio->phys)); hv_serio->start = hv_kbd_start;
drivers/input/serio/i8042-x86ia64io.h +3 -3
@@ -948,7 +948,7 @@ static char i8042_pnp_aux_name[32];static void i8042_pnp_id_to_string (struct pnp_id *id,char *dst,int dst_size) { -strlcpy (dst,"PNP:" , dst_size); +strscpy (dst,"PNP:" , dst_size);while (id) {strlcat (dst," " , dst_size);
@@ -968,7 +968,7 @@ static int i8042_pnp_kbd_probe(struct pnp_dev *dev, const struct pnp_device_id *if (pnp_irq_valid (dev,0 )) i8042_pnp_kbd_irq =pnp_irq (dev,0 ); -strlcpy (i8042_pnp_kbd_name, did->id,sizeof (i8042_pnp_kbd_name)); +strscpy (i8042_pnp_kbd_name, did->id,sizeof (i8042_pnp_kbd_name));if (strlen (pnp_dev_name (dev))) {strlcat (i8042_pnp_kbd_name,":" ,sizeof (i8042_pnp_kbd_name));strlcat (i8042_pnp_kbd_name,pnp_dev_name (dev),sizeof (i8042_pnp_kbd_name));
@@ -995,7 +995,7 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *if (pnp_irq_valid (dev,0 )) i8042_pnp_aux_irq =pnp_irq (dev,0 ); -strlcpy (i8042_pnp_aux_name, did->id,sizeof (i8042_pnp_aux_name)); +strscpy (i8042_pnp_aux_name, did->id,sizeof (i8042_pnp_aux_name));if (strlen (pnp_dev_name (dev))) {strlcat (i8042_pnp_aux_name,":" ,sizeof (i8042_pnp_aux_name));strlcat (i8042_pnp_aux_name,pnp_dev_name (dev),sizeof (i8042_pnp_aux_name));
drivers/input/serio/i8042.c +7 -7
@@ -1337,9 +1337,9 @@ static int __init i8042_create_kbd_port(void) serio->ps2_cmd_mutex = &i8042_mutex; serio->port_data = port; serio->dev.parent = &i8042_platform_device->dev; -strlcpy (serio->name,"i8042 KBD port" ,sizeof (serio->name)); -strlcpy (serio->phys,I8042_KBD_PHYS_DESC ,sizeof (serio->phys)); -strlcpy (serio->firmware_id, i8042_kbd_firmware_id, +strscpy (serio->name,"i8042 KBD port" ,sizeof (serio->name)); +strscpy (serio->phys,I8042_KBD_PHYS_DESC ,sizeof (serio->phys)); +strscpy (serio->firmware_id, i8042_kbd_firmware_id,sizeof (serio->firmware_id));set_primary_fwnode (&serio->dev, i8042_kbd_fwnode);
@@ -1367,15 +1367,15 @@ static int __init i8042_create_aux_port(int idx) serio->port_data = port; serio->dev.parent = &i8042_platform_device->dev;if (idx <0 ) { -strlcpy (serio->name,"i8042 AUX port" ,sizeof (serio->name)); -strlcpy (serio->phys,I8042_AUX_PHYS_DESC ,sizeof (serio->phys)); -strlcpy (serio->firmware_id, i8042_aux_firmware_id, +strscpy (serio->name,"i8042 AUX port" ,sizeof (serio->name)); +strscpy (serio->phys,I8042_AUX_PHYS_DESC ,sizeof (serio->phys)); +strscpy (serio->firmware_id, i8042_aux_firmware_id,sizeof (serio->firmware_id)); serio->close = i8042_port_close; }else {snprintf (serio->name,sizeof (serio->name),"i8042 AUX%d port" , idx);snprintf (serio->phys,sizeof (serio->phys),I8042_MUX_PHYS_DESC , idx +1 ); -strlcpy (serio->firmware_id, i8042_aux_firmware_id, +strscpy (serio->firmware_id, i8042_aux_firmware_id,sizeof (serio->firmware_id)); }
drivers/input/serio/olpc_apsp.c +4 -4
@@ -199,8 +199,8 @@ static int olpc_apsp_probe(struct platform_device *pdev) kb_serio->close = olpc_apsp_close; kb_serio->port_data = priv; kb_serio->dev.parent = &pdev->dev; -strlcpy (kb_serio->name,"sp keyboard" ,sizeof (kb_serio->name)); -strlcpy (kb_serio->phys,"sp/serio0" ,sizeof (kb_serio->phys)); +strscpy (kb_serio->name,"sp keyboard" ,sizeof (kb_serio->name)); +strscpy (kb_serio->phys,"sp/serio0" ,sizeof (kb_serio->phys)); priv->kbio = kb_serio;serio_register_port (kb_serio);
@@ -216,8 +216,8 @@ static int olpc_apsp_probe(struct platform_device *pdev) pad_serio->close = olpc_apsp_close; pad_serio->port_data = priv; pad_serio->dev.parent = &pdev->dev; -strlcpy (pad_serio->name,"sp touchpad" ,sizeof (pad_serio->name)); -strlcpy (pad_serio->phys,"sp/serio1" ,sizeof (pad_serio->phys)); +strscpy (pad_serio->name,"sp touchpad" ,sizeof (pad_serio->name)); +strscpy (pad_serio->phys,"sp/serio1" ,sizeof (pad_serio->phys)); priv->padio = pad_serio;serio_register_port (pad_serio);
drivers/input/serio/parkbd.c +2 -1
@@ -169,7 +169,8 @@ static struct serio *parkbd_allocate_serio(void)if (serio) { serio->id.type = parkbd_mode; serio->write = parkbd_write, -strlcpy (serio->name,"PARKBD AT/XT keyboard adapter" ,sizeof (serio->name)); +strscpy (serio->name,"PARKBD AT/XT keyboard adapter" , +sizeof (serio->name));snprintf (serio->phys,sizeof (serio->phys),"%s/serio0" , parkbd_dev->port->name); }
drivers/input/serio/pcips2.c +2 -2
@@ -149,8 +149,8 @@ static int pcips2_probe(struct pci_dev *dev, const struct pci_device_id *id) serio->write = pcips2_write; serio->open = pcips2_open; serio->close = pcips2_close; -strlcpy (serio->name,pci_name (dev),sizeof (serio->name)); -strlcpy (serio->phys,dev_name (&dev->dev),sizeof (serio->phys)); +strscpy (serio->name,pci_name (dev),sizeof (serio->name)); +strscpy (serio->phys,dev_name (&dev->dev),sizeof (serio->phys)); serio->port_data = ps2if; serio->dev.parent = &dev->dev; ps2if->io = serio;
drivers/input/serio/ps2-gpio.c +2 -2
@@ -393,8 +393,8 @@ static int ps2_gpio_probe(struct platform_device *pdev) serio->write = drvdata->write_enable ? ps2_gpio_write :NULL ; serio->port_data = drvdata; serio->dev.parent = dev; -strlcpy (serio->name,dev_name (dev),sizeof (serio->name)); -strlcpy (serio->phys,dev_name (dev),sizeof (serio->phys)); +strscpy (serio->name,dev_name (dev),sizeof (serio->name)); +strscpy (serio->phys,dev_name (dev),sizeof (serio->phys)); drvdata->serio = serio; drvdata->dev = dev;
drivers/input/serio/ps2mult.c +1 -1
@@ -131,7 +131,7 @@ static int ps2mult_create_port(struct ps2mult *psm, int i)if (!serio)return -ENOMEM ; -strlcpy (serio->name,"TQC PS/2 Multiplexer" ,sizeof (serio->name)); +strscpy (serio->name,"TQC PS/2 Multiplexer" ,sizeof (serio->name));snprintf (serio->phys,sizeof (serio->phys),"%s/port%d" , mx_serio->phys, i); serio->id.type =SERIO_8042 ;
drivers/input/serio/q40kbd.c +2 -2
@@ -126,8 +126,8 @@ static int q40kbd_probe(struct platform_device *pdev) port->close = q40kbd_close; port->port_data = q40kbd; port->dev.parent = &pdev->dev; -strlcpy (port->name,"Q40 Kbd Port" ,sizeof (port->name)); -strlcpy (port->phys,"Q40" ,sizeof (port->phys)); +strscpy (port->name,"Q40 Kbd Port" ,sizeof (port->name)); +strscpy (port->phys,"Q40" ,sizeof (port->phys));q40kbd_stop ();
drivers/input/serio/rpckbd.c +2 -2
@@ -128,8 +128,8 @@ static int rpckbd_probe(struct platform_device *dev) serio->close = rpckbd_close; serio->dev.parent = &dev->dev; serio->port_data = rpckbd; -strlcpy (serio->name,"RiscPC PS/2 kbd port" ,sizeof (serio->name)); -strlcpy (serio->phys,"rpckbd/serio0" ,sizeof (serio->phys)); +strscpy (serio->name,"RiscPC PS/2 kbd port" ,sizeof (serio->name)); +strscpy (serio->phys,"rpckbd/serio0" ,sizeof (serio->phys));platform_set_drvdata (dev, serio);serio_register_port (serio);
drivers/input/serio/sa1111ps2.c +2 -2
@@ -267,8 +267,8 @@ static int ps2_probe(struct sa1111_dev *dev) serio->write = ps2_write; serio->open = ps2_open; serio->close = ps2_close; -strlcpy (serio->name,dev_name (&dev->dev),sizeof (serio->name)); -strlcpy (serio->phys,dev_name (&dev->dev),sizeof (serio->phys)); +strscpy (serio->name,dev_name (&dev->dev),sizeof (serio->name)); +strscpy (serio->phys,dev_name (&dev->dev),sizeof (serio->phys)); serio->port_data = ps2if; serio->dev.parent = &dev->dev; ps2if->io = serio;
drivers/input/serio/serport.c +1 -1
@@ -168,7 +168,7 @@ static ssize_t serport_ldisc_read(struct tty_struct * tty, struct file * file, uif (!serio)return -ENOMEM ; -strlcpy (serio->name,"Serial port" ,sizeof (serio->name)); +strscpy (serio->name,"Serial port" ,sizeof (serio->name));snprintf (serio->phys,sizeof (serio->phys),"%s/serio0" ,tty_name (tty)); serio->id = serport->id; serio->id.type =SERIO_RS232 ;
drivers/input/serio/sun4i-ps2.c +2 -2
@@ -256,8 +256,8 @@ static int sun4i_ps2_probe(struct platform_device *pdev) serio->close = sun4i_ps2_close; serio->port_data = drvdata; serio->dev.parent = dev; -strlcpy (serio->name,dev_name (dev),sizeof (serio->name)); -strlcpy (serio->phys,dev_name (dev),sizeof (serio->phys)); +strscpy (serio->name,dev_name (dev),sizeof (serio->name)); +strscpy (serio->phys,dev_name (dev),sizeof (serio->phys));/* shutoff interrupt */ writel (0 , drvdata->reg_base +PS2_REG_GCTL );
drivers/input/tablet/acecad.c +1 -1
@@ -155,7 +155,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ acecad->input = input_dev;if (dev->manufacturer) -strlcpy (acecad->name, dev->manufacturer,sizeof (acecad->name)); +strscpy (acecad->name, dev->manufacturer,sizeof (acecad->name));if (dev->product) {if (dev->manufacturer)
drivers/input/tablet/hanwang.c +1 -1
@@ -356,7 +356,7 @@ static int hanwang_probe(struct usb_interface *intf, const struct usb_device_idusb_make_path (dev, hanwang->phys,sizeof (hanwang->phys));strlcat (hanwang->phys,"/input0" ,sizeof (hanwang->phys)); -strlcpy (hanwang->name, hanwang->features->name,sizeof (hanwang->name)); +strscpy (hanwang->name, hanwang->features->name,sizeof (hanwang->name)); input_dev->name = hanwang->name; input_dev->phys = hanwang->phys;usb_to_input_id (dev, &input_dev->id);
drivers/input/tablet/pegasus_notetaker.c +1 -1
@@ -319,7 +319,7 @@ static int pegasus_probe(struct usb_interface *intf, pegasus->irq->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ;if (dev->manufacturer) -strlcpy (pegasus->name, dev->manufacturer, +strscpy (pegasus->name, dev->manufacturer,sizeof (pegasus->name));if (dev->product) {
drivers/input/touchscreen/atmel_mxt_ts.c +4 -4
@@ -2454,8 +2454,8 @@ static int mxt_vidioc_querycap(struct file *file, void *priv, {struct mxt_data *data =video_drvdata (file); -strlcpy (cap->driver,"atmel_mxt_ts" ,sizeof (cap->driver)); -strlcpy (cap->card,"atmel_mxt_ts touch" ,sizeof (cap->card)); +strscpy (cap->driver,"atmel_mxt_ts" ,sizeof (cap->driver)); +strscpy (cap->card,"atmel_mxt_ts touch" ,sizeof (cap->card));snprintf (cap->bus_info,sizeof (cap->bus_info),"I2C:%s" ,dev_name (&data->client->dev));return 0 ;
@@ -2471,11 +2471,11 @@ static int mxt_vidioc_enum_input(struct file *file, void *priv,switch (i->index) {case MXT_V4L_INPUT_REFS : -strlcpy (i->name,"Mutual Capacitance References" , +strscpy (i->name,"Mutual Capacitance References" ,sizeof (i->name));break ;case MXT_V4L_INPUT_DELTAS : -strlcpy (i->name,"Mutual Capacitance Deltas" ,sizeof (i->name)); +strscpy (i->name,"Mutual Capacitance Deltas" ,sizeof (i->name));break ; }
drivers/input/touchscreen/edt-ft5x06.c +6 -6
@@ -850,8 +850,8 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client, p =strchr (rdbuf,'*' );if (p) *p++ ='\0' ; -strlcpy (model_name, rdbuf +1 ,EDT_NAME_LEN ); -strlcpy (fw_version, p ? p :"" ,EDT_NAME_LEN ); +strscpy (model_name, rdbuf +1 ,EDT_NAME_LEN ); +strscpy (fw_version, p ? p :"" ,EDT_NAME_LEN ); }else if (!strncasecmp (rdbuf,"EP0" ,3 )) { tsdata->version =EDT_M12 ;
@@ -864,8 +864,8 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client, p =strchr (rdbuf,'*' );if (p) *p++ ='\0' ; -strlcpy (model_name, rdbuf,EDT_NAME_LEN ); -strlcpy (fw_version, p ? p :"" ,EDT_NAME_LEN ); +strscpy (model_name, rdbuf,EDT_NAME_LEN ); +strscpy (fw_version, p ? p :"" ,EDT_NAME_LEN ); }else {/* If it is not an EDT M06/M12 touchscreen, then the model * detection is a bit hairy. The different ft5x06
@@ -883,7 +883,7 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,if (error)return error; -strlcpy (fw_version, rdbuf,2 ); +strscpy (fw_version, rdbuf,2 ); error =edt_ft5x06_ts_readwrite (client,1 ,"\xA8" ,1 , rdbuf);
@@ -918,7 +918,7 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client, 1, rdbuf);if (error)return error; -strlcpy (fw_version, rdbuf,1 ); +strscpy (fw_version, rdbuf,1 );snprintf (model_name,EDT_NAME_LEN ,"EVERVISION-FT5726NEi" );break ;
drivers/input/touchscreen/exc3000.c +2 -2
@@ -177,9 +177,9 @@ static int exc3000_query_interrupt(struct exc3000_data *data)return -EPROTO ;if (buf[4 ] =='E' ) -strlcpy (data->model, buf +5 ,sizeof (data->model)); +strscpy (data->model, buf +5 ,sizeof (data->model));else if (buf[4 ] =='D' ) -strlcpy (data->fw_version, buf +5 ,sizeof (data->fw_version)); +strscpy (data->fw_version, buf +5 ,sizeof (data->fw_version));else return -EPROTO ;
drivers/input/touchscreen/sur40.c +3 -3
@@ -938,8 +938,8 @@ static int sur40_vidioc_querycap(struct file *file, void *priv, {struct sur40_state *sur40 =video_drvdata (file); -strlcpy (cap->driver,DRIVER_SHORT ,sizeof (cap->driver)); -strlcpy (cap->card,DRIVER_LONG ,sizeof (cap->card)); +strscpy (cap->driver,DRIVER_SHORT ,sizeof (cap->driver)); +strscpy (cap->card,DRIVER_LONG ,sizeof (cap->card));usb_make_path (sur40->usbdev, cap->bus_info,sizeof (cap->bus_info));return 0 ; }
@@ -951,7 +951,7 @@ static int sur40_vidioc_enum_input(struct file *file, void *priv,return -EINVAL ; i->type =V4L2_INPUT_TYPE_TOUCH ; i->std =V4L2_STD_UNKNOWN ; -strlcpy (i->name,"In-Cell Sensor" ,sizeof (i->name)); +strscpy (i->name,"In-Cell Sensor" ,sizeof (i->name)); i->capabilities =0 ;return 0 ; }
drivers/input/touchscreen/usbtouchscreen.c +2 -1
@@ -1702,7 +1702,8 @@ static int usbtouch_probe(struct usb_interface *intf, usbtouch->input = input_dev;if (udev->manufacturer) -strlcpy (usbtouch->name, udev->manufacturer,sizeof (usbtouch->name)); +strscpy (usbtouch->name, udev->manufacturer, +sizeof (usbtouch->name));if (udev->product) {if (udev->manufacturer)
drivers/input/touchscreen/wacom_w8001.c +4 -3
@@ -625,7 +625,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)/* For backwards-compatibility we compose the basename based on * capabilities and then just append the tool type */ -strlcpy (basename,"Wacom Serial" ,sizeof (basename)); +strscpy (basename,"Wacom Serial" ,sizeof (basename)); err_pen =w8001_setup_pen (w8001, basename,sizeof (basename)); err_touch =w8001_setup_touch (w8001, basename,sizeof (basename));
@@ -635,7 +635,7 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv) }if (!err_pen) { -strlcpy (w8001->pen_name, basename,sizeof (w8001->pen_name)); +strscpy (w8001->pen_name, basename,sizeof (w8001->pen_name));strlcat (w8001->pen_name," Pen" ,sizeof (w8001->pen_name)); input_dev_pen->name = w8001->pen_name;
@@ -651,7 +651,8 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv) }if (!err_touch) { -strlcpy (w8001->touch_name, basename,sizeof (w8001->touch_name)); +strscpy (w8001->touch_name, basename, +sizeof (w8001->touch_name));strlcat (w8001->touch_name," Finger" ,sizeof (w8001->touch_name)); input_dev_touch->name = w8001->touch_name;
drivers/isdn/capi/kcapi.c +2 -2
@@ -793,7 +793,7 @@ u16 capi20_get_serial(u32 contr, u8 *serial)u16 ret;if (contr ==0 ) { -strlcpy (serial, driver_serial,CAPI_SERIAL_LEN ); +strscpy (serial, driver_serial,CAPI_SERIAL_LEN );return CAPI_NOERROR ; }
@@ -801,7 +801,7 @@ u16 capi20_get_serial(u32 contr, u8 *serial) ctr =get_capi_ctr_by_nr (contr);if (ctr && ctr->state ==CAPI_CTR_RUNNING ) { -strlcpy (serial, ctr->serial,CAPI_SERIAL_LEN ); +strscpy (serial, ctr->serial,CAPI_SERIAL_LEN ); ret =CAPI_NOERROR ; }else ret =CAPI_REGNOTINSTALLED ;
drivers/leds/led-class.c +1 -1
@@ -315,7 +315,7 @@ static int led_classdev_next_name(const char *init_name, char *name,int ret =0 ;struct device *dev; -strlcpy (name, init_name, len); +strscpy (name, init_name, len);while ((ret < len) && (dev =class_find_device_by_name (leds_class, name))) {
drivers/leds/leds-aat1290.c +1 -1
@@ -425,7 +425,7 @@ static void aat1290_init_v4l2_flash_config(struct aat1290_led *led,struct led_classdev *led_cdev = &led->fled_cdev.led_cdev;struct led_flash_setting *s; - strlcpy(v4l2_sd_cfg->dev_name, led_cdev->dev->kobj.name, + strscpy(v4l2_sd_cfg->dev_name, led_cdev->dev->kobj.name,
Lines of this file are not shown. View the raw message.
drivers/misc/habanalabs/common/device.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/can/usb/peak_usb/pcan_usb_core.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/dsa/sja1105/sja1105_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/adaptec/starfire.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/alacritech/slicoss.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/allwinner/sun4i-emac.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/amazon/ena/ena_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/atheros/atlx/atl1.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/atheros/atlx/atl2.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bcm63xx_enet.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bcmsysport.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/brocade/bna/bnad_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/cxgb/cxgb2.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/cirrus/ep93xx_eth.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/cisco/enic/enic_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/dec/tulip/de2104x.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/dec/tulip/tulip_core.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/dec/tulip/uli526x.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/dec/tulip/winbond-840.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/emulex/benet/be_cmds.c +9 -7
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/emulex/benet/be_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/faraday/ftgmac100.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/faraday/ftmac100.c +3 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +2 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/fec_main.c +5 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/fec_ptp.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/gianfar_ethtool.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/freescale/ucc_geth_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/fujitsu/fmvj18x_cs.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/google/gve/gve_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/hisilicon/hip04_eth.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/ibm/ehea/ehea_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/e1000/e1000_ethtool.c +2 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/e1000e/ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/e1000e/netdev.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_main.c +8 -8
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/iavf/iavf_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/igb/igb_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/igbvf/ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/igc/igc_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c +2 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/ixgbevf/ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/marvell/mv643xx_eth.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +3 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/marvell/prestera/prestera_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/marvell/pxa168_eth.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mediatek/mtk_eth_soc.c +4 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mediatek/mtk_star_emac.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c +3 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx4/fw.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +3 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlxsw/core.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlxsw/minimal.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/mellanox/mlxsw/switchx2.c +4 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/micrel/ks8851_common.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/microchip/enc28j60.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/microchip/encx24j600.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/microchip/lan743x_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/neterion/vxge/vxge-ethtool.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/neterion/vxge/vxge-main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/nvidia/forcedeth.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c +4 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/packetengines/hamachi.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/packetengines/yellowfin.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/pensando/ionic/ionic_lif.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qed/qed_int.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qed/qed_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qede/qede_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qede/qede_main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qualcomm/emac/emac-ethtool.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/qualcomm/qca_debug.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/realtek/r8169_main.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/rocker/rocker_main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/sfc/ethtool_common.c +4 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/sfc/falcon/ethtool.c +5 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/sfc/falcon/falcon.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/smsc/smc91c92_cs.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/socionext/netsec.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/socionext/sni_ave.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +5 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/synopsys/dwc-xlgmac-common.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/synopsys/dwc-xlgmac-ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/ti/am65-cpsw-ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/toshiba/ps3_gelic_net.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/toshiba/spider_net_ethtool.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/via/via-velocity.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/xircom/xirc2ps_cs.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/xscale/ixp4xx_eth.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/ath10k/coredump.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/wil6210/main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/ath/wil6210/netdev.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/b43/leds.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/b43legacy/leds.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +2 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/ipw2x00/ipw2100.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/ipw2x00/ipw2200.c +3 -4
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intel/iwlegacy/3945-mac.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intersil/hostap/hostap_ioctl.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/intersil/prism54/islpci_dev.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/libertas/ethtool.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/mwifiex/main.c +1 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt7615/mt7615_trace.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x02_trace.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/trace.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/usb_trace.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt7601u/trace.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/microchip/wilc1000/mon.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/quantenna/qtnfmac/commands.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/platform/x86/i2c-multi-instantiate.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/platform/x86/intel_cht_int33fe_typec.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/staging/greybus/audio_topology.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/target/iscsi/iscsi_target_parameters.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/target/iscsi/iscsi_target_util.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/matrox/matroxfb_base.c +4 -3
Lines of this file are not shown. View the raw message.
drivers/video/fbdev/omap2/omapfb/omapfb-main.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/virt/vboxguest/vboxguest_core.c +1 -2
Lines of this file are not shown. View the raw message.
drivers/xen/xenbus/xenbus_probe_frontend.c +1 -1
Lines of this file are not shown. View the raw message.
net/netfilter/ipset/ip_set_hash_netiface.c +1 -1
Lines of this file are not shown. View the raw message.
samples/trace_events/trace-events-sample.h +1 -1
Lines of this file are not shown. View the raw message.
sound/firewire/fireworks/fireworks_hwdep.c +1 -1
Lines of this file are not shown. View the raw message.
sound/pci/cs5535audio/cs5535audio_olpc.c +2 -2
Lines of this file are not shown. View the raw message.
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
Hi,
It is just a pre-review before I split these commits into severals ones by using Kees's script (one commit per maintainer).
Regards,
Romain
Le ven. 4 déc. 2020 à 16:38, Romain Perier <[email protected]> a écrit :
Quoted 953 lines
strlcpy()copy a C-String into a sized buffer, the result is always a valid NULL-terminated that fits in the buffer, howerver it has severals issues. It reads the source buffer first, which is dangerous if it is non NULL-terminated or if the corresponding buffer is unbounded. Its safe replacement isstrscpy(), as suggested in the deprecated interface [1].This series replaces all occurences of strlcpy in two steps, firsly all cases of strlcpy's return value are manually replaced by the corresponding calls of
strscpy()with the new handling of the return value (as the return code is different in case of error). Then all other cases are automatically replaced by using coccinelle.[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
Romain Perier (2):
Manual replacement of the deprecatedstrlcpy()with return values Automated replacement of all other deprecatedstrlcpy()arch/alpha/kernel/setup.c | 5 +- arch/arm/kernel/atags_parse.c | 4 +- arch/arm/kernel/setup.c | 2 +- arch/arm/kernel/vdso.c | 2 +- arch/arm/mach-s3c/mach-mini2440.c | 2 +- arch/arm/mach-s3c/mach-mini6410.c | 2 +- arch/arm/mach-s3c/mach-real6410.c | 2 +- arch/hexagon/kernel/setup.c | 6 +- arch/ia64/kernel/setup.c | 2 +- arch/m68k/emu/natfeat.c | 6 +- arch/m68k/kernel/setup_mm.c | 2 +- arch/microblaze/kernel/prom.c | 2 +- arch/mips/bcm47xx/board.c | 2 +- arch/mips/kernel/prom.c | 6 +- arch/mips/kernel/relocate.c | 2 +- arch/mips/kernel/setup.c | 6 +- arch/mips/pic32/pic32mzda/init.c | 2 +- arch/nios2/kernel/cpuinfo.c | 2 +- arch/nios2/kernel/setup.c | 6 +- arch/parisc/kernel/drivers.c | 2 +- arch/parisc/kernel/setup.c | 2 +- arch/powerpc/kernel/dt_cpu_ftrs.c | 2 +- arch/powerpc/kernel/vdso.c | 4 +- arch/powerpc/platforms/pasemi/misc.c | 3 +- arch/powerpc/platforms/powermac/bootx_init.c | 2 +- arch/powerpc/platforms/powernv/idle.c | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/hvcserver.c | 2 +- arch/riscv/kernel/setup.c | 2 +- arch/s390/kernel/debug.c | 2 +- arch/s390/kernel/early.c | 2 +- arch/sh/drivers/dma/dma-api.c | 2 +- arch/sh/kernel/setup.c | 4 +- arch/sparc/kernel/ioport.c | 2 +- arch/sparc/kernel/setup_32.c | 2 +- arch/sparc/kernel/setup_64.c | 2 +- arch/sparc/prom/bootstr_32.c | 3 +- arch/um/drivers/net_kern.c | 2 +- arch/um/drivers/vector_kern.c | 2 +- arch/um/kernel/um_arch.c | 2 +- arch/um/os-Linux/drivers/tuntap_user.c | 2 +- arch/um/os-Linux/umid.c | 6 +- arch/x86/kernel/setup.c | 6 +- arch/xtensa/kernel/setup.c | 8 +-- arch/xtensa/platforms/iss/network.c | 4 +- block/elevator.c | 2 +- block/genhd.c | 2 +- crypto/api.c | 2 +- crypto/essiv.c | 2 +- crypto/lrw.c | 6 +- crypto/xts.c | 6 +- drivers/acpi/bus.c | 4 +- drivers/acpi/processor_idle.c | 8 +-- drivers/acpi/utils.c | 6 +- drivers/base/dd.c | 2 +- drivers/block/drbd/drbd_nl.c | 3 +- drivers/block/mtip32xx/mtip32xx.c | 20 +++--- drivers/block/ps3vram.c | 2 +- drivers/block/rnbd/rnbd-clt-sysfs.c | 6 +- drivers/block/rnbd/rnbd-clt.c | 6 +- drivers/block/rnbd/rnbd-srv.c | 6 +- drivers/block/zram/zram_drv.c | 7 +- drivers/char/ipmi/ipmi_ssif.c | 2 +- drivers/char/tpm/tpm_ppi.c | 2 +- drivers/clk/clkdev.c | 2 +- drivers/clk/mvebu/dove-divider.c | 2 +- drivers/clk/tegra/clk-bpmp.c | 2 +- drivers/cpuidle/cpuidle-powernv.c | 4 +- .../crypto/marvell/octeontx/otx_cptpf_ucode.c | 6 +- drivers/crypto/qat/qat_common/adf_cfg.c | 6 +- drivers/crypto/qat/qat_common/adf_ctl_drv.c | 3 +- .../qat/qat_common/adf_transport_debug.c | 2 +- drivers/dma-buf/dma-buf.c | 4 +- drivers/dma-buf/sw_sync.c | 2 +- drivers/dma-buf/sync_file.c | 8 +-- drivers/dma/dmatest.c | 12 ++-- drivers/dma/xilinx/xilinx_dpdma.c | 2 +- drivers/eisa/eisa-bus.c | 3 +- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/reset.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 3 +- drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 2 +- .../drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 6 +- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/drm_dp_helper.c | 2 +- drivers/gpu/drm/drm_dp_mst_topology.c | 2 +- drivers/gpu/drm/drm_mipi_dsi.c | 2 +- drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 2 +- drivers/gpu/drm/msm/dp/dp_parser.c | 9 ++- drivers/gpu/drm/radeon/radeon_atombios.c | 4 +- drivers/gpu/drm/radeon/radeon_combios.c | 4 +- drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 2 +- drivers/hid/hid-steam.c | 12 ++-- drivers/hid/i2c-hid/i2c-hid-core.c | 2 +- drivers/hid/usbhid/hid-core.c | 2 +- drivers/hid/usbhid/usbkbd.c | 2 +- drivers/hid/usbhid/usbmouse.c | 2 +- drivers/hid/wacom_sys.c | 6 +- drivers/hwmon/adc128d818.c | 2 +- drivers/hwmon/adm1021.c | 2 +- drivers/hwmon/adm1025.c | 2 +- drivers/hwmon/adm1026.c | 2 +- drivers/hwmon/adm1029.c | 2 +- drivers/hwmon/adm1031.c | 2 +- drivers/hwmon/adm9240.c | 2 +- drivers/hwmon/adt7411.c | 2 +- drivers/hwmon/adt7462.c | 2 +- drivers/hwmon/adt7470.c | 2 +- drivers/hwmon/adt7475.c | 2 +- drivers/hwmon/amc6821.c | 2 +- drivers/hwmon/asb100.c | 2 +- drivers/hwmon/asc7621.c | 2 +- drivers/hwmon/dell-smm-hwmon.c | 6 +- drivers/hwmon/dme1737.c | 2 +- drivers/hwmon/emc1403.c | 12 ++-- drivers/hwmon/emc2103.c | 2 +- drivers/hwmon/emc6w201.c | 2 +- drivers/hwmon/f75375s.c | 2 +- drivers/hwmon/fschmd.c | 2 +- drivers/hwmon/ftsteutates.c | 2 +- drivers/hwmon/gl518sm.c | 2 +- drivers/hwmon/gl520sm.c | 2 +- drivers/hwmon/jc42.c | 2 +- drivers/hwmon/lm63.c | 6 +- drivers/hwmon/lm73.c | 2 +- drivers/hwmon/lm75.c | 2 +- drivers/hwmon/lm77.c | 2 +- drivers/hwmon/lm78.c | 2 +- drivers/hwmon/lm80.c | 2 +- drivers/hwmon/lm83.c | 2 +- drivers/hwmon/lm85.c | 2 +- drivers/hwmon/lm87.c | 2 +- drivers/hwmon/lm90.c | 2 +- drivers/hwmon/lm92.c | 2 +- drivers/hwmon/lm93.c | 2 +- drivers/hwmon/lm95234.c | 2 +- drivers/hwmon/lm95241.c | 2 +- drivers/hwmon/lm95245.c | 2 +- drivers/hwmon/max1619.c | 2 +- drivers/hwmon/max1668.c | 2 +- drivers/hwmon/max31730.c | 2 +- drivers/hwmon/max6639.c | 2 +- drivers/hwmon/max6642.c | 2 +- drivers/hwmon/nct7802.c | 2 +- drivers/hwmon/nct7904.c | 2 +- drivers/hwmon/pmbus/max20730.c | 66 ++++++++++--------- drivers/hwmon/sch56xx-common.c | 2 +- drivers/hwmon/smsc47m192.c | 2 +- drivers/hwmon/stts751.c | 2 +- drivers/hwmon/thmc50.c | 2 +- drivers/hwmon/tmp401.c | 2 +- drivers/hwmon/tmp421.c | 2 +- drivers/hwmon/w83781d.c | 2 +- drivers/hwmon/w83791d.c | 2 +- drivers/hwmon/w83792d.c | 2 +- drivers/hwmon/w83793.c | 2 +- drivers/hwmon/w83795.c | 2 +- drivers/hwmon/w83l785ts.c | 2 +- drivers/hwmon/w83l786ng.c | 2 +- drivers/i2c/busses/i2c-altera.c | 2 +- drivers/i2c/busses/i2c-aspeed.c | 2 +- drivers/i2c/busses/i2c-au1550.c | 2 +- drivers/i2c/busses/i2c-axxia.c | 2 +- drivers/i2c/busses/i2c-bcm-kona.c | 2 +- drivers/i2c/busses/i2c-brcmstb.c | 2 +- drivers/i2c/busses/i2c-cbus-gpio.c | 2 +- drivers/i2c/busses/i2c-cht-wc.c | 2 +- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +- drivers/i2c/busses/i2c-davinci.c | 2 +- drivers/i2c/busses/i2c-digicolor.c | 2 +- drivers/i2c/busses/i2c-efm32.c | 2 +- drivers/i2c/busses/i2c-eg20t.c | 3 +- drivers/i2c/busses/i2c-emev2.c | 2 +- drivers/i2c/busses/i2c-exynos5.c | 2 +- drivers/i2c/busses/i2c-gpio.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 2 +- drivers/i2c/busses/i2c-hix5hd2.c | 2 +- drivers/i2c/busses/i2c-i801.c | 6 +- drivers/i2c/busses/i2c-ibm_iic.c | 2 +- drivers/i2c/busses/i2c-icy.c | 2 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- drivers/i2c/busses/i2c-imx.c | 3 +- drivers/i2c/busses/i2c-lpc2k.c | 2 +- drivers/i2c/busses/i2c-meson.c | 3 +- drivers/i2c/busses/i2c-mt65xx.c | 2 +- drivers/i2c/busses/i2c-mt7621.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- drivers/i2c/busses/i2c-mxs.c | 2 +- drivers/i2c/busses/i2c-nvidia-gpu.c | 4 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/i2c/busses/i2c-opal.c | 4 +- drivers/i2c/busses/i2c-parport.c | 2 +- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-qcom-geni.c | 2 +- drivers/i2c/busses/i2c-qup.c | 2 +- drivers/i2c/busses/i2c-rcar.c | 2 +- drivers/i2c/busses/i2c-riic.c | 2 +- drivers/i2c/busses/i2c-rk3x.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 2 +- drivers/i2c/busses/i2c-sh_mobile.c | 2 +- drivers/i2c/busses/i2c-simtec.c | 2 +- drivers/i2c/busses/i2c-sirf.c | 2 +- drivers/i2c/busses/i2c-stu300.c | 2 +- drivers/i2c/busses/i2c-sun6i-p2wi.c | 2 +- drivers/i2c/busses/i2c-taos-evm.c | 2 +- drivers/i2c/busses/i2c-tegra-bpmp.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 2 +- drivers/i2c/busses/i2c-uniphier-f.c | 2 +- drivers/i2c/busses/i2c-uniphier.c | 2 +- drivers/i2c/busses/i2c-versatile.c | 3 +- drivers/i2c/busses/i2c-wmt.c | 2 +- drivers/i2c/busses/i2c-zx2967.c | 3 +- drivers/i2c/i2c-core-base.c | 2 +- drivers/i2c/i2c-smbus.c | 2 +- drivers/idle/intel_idle.c | 2 +- .../iio/common/st_sensors/st_sensors_core.c | 2 +- drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 4 +- drivers/infiniband/core/cma_configfs.c | 2 +- drivers/infiniband/core/device.c | 4 +- drivers/infiniband/hw/bnxt_re/main.c | 2 +- drivers/infiniband/hw/efa/efa_main.c | 4 +- drivers/infiniband/hw/hfi1/file_ops.c | 2 +- drivers/infiniband/hw/hfi1/verbs.c | 2 +- drivers/infiniband/hw/mthca/mthca_cmd.c | 3 +- drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +- drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 4 +- .../ulp/opa_vnic/opa_vnic_ethtool.c | 5 +- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 6 +- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 6 +- drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- drivers/input/keyboard/lkkbd.c | 8 +-- drivers/input/misc/keyspan_remote.c | 3 +- drivers/input/mouse/hgpk.c | 2 +- drivers/input/mouse/synaptics.c | 4 +- drivers/input/mouse/synaptics_usb.c | 2 +- drivers/input/mouse/vsxxxaa.c | 4 +- drivers/input/rmi4/rmi_f03.c | 2 +- drivers/input/rmi4/rmi_f54.c | 8 +-- drivers/input/serio/altera_ps2.c | 4 +- drivers/input/serio/ambakmi.c | 4 +- drivers/input/serio/ams_delta_serio.c | 5 +- drivers/input/serio/apbps2.c | 2 +- drivers/input/serio/ct82c710.c | 2 +- drivers/input/serio/gscps2.c | 2 +- drivers/input/serio/hyperv-keyboard.c | 4 +- drivers/input/serio/i8042-x86ia64io.h | 6 +- drivers/input/serio/i8042.c | 14 ++-- drivers/input/serio/olpc_apsp.c | 8 +-- drivers/input/serio/parkbd.c | 3 +- drivers/input/serio/pcips2.c | 4 +- drivers/input/serio/ps2-gpio.c | 4 +- drivers/input/serio/ps2mult.c | 2 +- drivers/input/serio/q40kbd.c | 4 +- drivers/input/serio/rpckbd.c | 4 +- drivers/input/serio/sa1111ps2.c | 4 +- drivers/input/serio/serport.c | 2 +- drivers/input/serio/sun4i-ps2.c | 4 +- drivers/input/tablet/acecad.c | 2 +- drivers/input/tablet/hanwang.c | 2 +- drivers/input/tablet/pegasus_notetaker.c | 2 +- drivers/input/touchscreen/atmel_mxt_ts.c | 8 +-- drivers/input/touchscreen/edt-ft5x06.c | 12 ++-- drivers/input/touchscreen/exc3000.c | 4 +- drivers/input/touchscreen/sur40.c | 6 +- drivers/input/touchscreen/usbtouchscreen.c | 3 +- drivers/input/touchscreen/wacom_w8001.c | 7 +- drivers/isdn/capi/kcapi.c | 4 +- drivers/leds/led-class.c | 2 +- drivers/leds/leds-aat1290.c | 2 +- drivers/leds/leds-as3645a.c | 4 +- drivers/leds/leds-blinkm.c | 2 +- drivers/leds/leds-spi-byte.c | 2 +- drivers/lightnvm/core.c | 6 +- drivers/macintosh/therm_windtunnel.c | 4 +- drivers/md/dm-ioctl.c | 4 +- drivers/md/md-bitmap.c | 6 +- drivers/md/md-cluster.c | 2 +- drivers/md/md.c | 6 +- drivers/message/fusion/mptbase.c | 6 +- drivers/message/fusion/mptctl.c | 5 +- drivers/mfd/htc-i2cpld.c | 2 +- drivers/mfd/lpc_ich.c | 2 +- drivers/mfd/mfd-core.c | 2 +- drivers/misc/altera-stapl/altera.c | 15 ++--- drivers/misc/eeprom/eeprom.c | 2 +- drivers/misc/eeprom/idt_89hpesx.c | 2 +- drivers/misc/habanalabs/common/device.c | 2 +- drivers/misc/ics932s401.c | 2 +- drivers/misc/mei/bus-fixup.c | 2 +- drivers/most/configfs.c | 8 +-- drivers/mtd/devices/block2mtd.c | 2 +- drivers/mtd/parsers/cmdlinepart.c | 4 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/can/sja1000/peak_pcmcia.c | 2 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/dsa/b53/b53_common.c | 4 +- drivers/net/dsa/bcm_sf2_cfp.c | 4 +- drivers/net/dsa/mv88e6xxx/chip.c | 5 +- drivers/net/dsa/sja1105/sja1105_ethtool.c | 4 +- drivers/net/dummy.c | 2 +- drivers/net/ethernet/3com/3c509.c | 2 +- drivers/net/ethernet/3com/3c515.c | 2 +- drivers/net/ethernet/3com/3c589_cs.c | 2 +- drivers/net/ethernet/3com/3c59x.c | 6 +- drivers/net/ethernet/3com/typhoon.c | 8 +-- drivers/net/ethernet/8390/ax88796.c | 6 +- drivers/net/ethernet/8390/etherh.c | 6 +- drivers/net/ethernet/adaptec/starfire.c | 4 +- drivers/net/ethernet/aeroflex/greth.c | 4 +- drivers/net/ethernet/agere/et131x.c | 4 +- drivers/net/ethernet/alacritech/slicoss.c | 4 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- drivers/net/ethernet/alteon/acenic.c | 6 +- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- drivers/net/ethernet/amd/amd8111e.c | 4 +- drivers/net/ethernet/amd/au1000_eth.c | 2 +- drivers/net/ethernet/amd/nmclan_cs.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 6 +- drivers/net/ethernet/amd/sunlance.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 4 +- .../ethernet/aquantia/atlantic/aq_ethtool.c | 2 +- drivers/net/ethernet/arc/emac_main.c | 2 +- drivers/net/ethernet/atheros/ag71xx.c | 4 +- .../ethernet/atheros/atl1c/atl1c_ethtool.c | 4 +- .../ethernet/atheros/atl1e/atl1e_ethtool.c | 6 +- drivers/net/ethernet/atheros/atlx/atl1.c | 4 +- drivers/net/ethernet/atheros/atlx/atl2.c | 6 +- drivers/net/ethernet/broadcom/b44.c | 7 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 5 +- drivers/net/ethernet/broadcom/bcmsysport.c | 4 +- drivers/net/ethernet/broadcom/bgmac.c | 8 +-- drivers/net/ethernet/broadcom/bnx2.c | 6 +- .../net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- .../ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 12 ++-- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 2 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 6 +- .../net/ethernet/brocade/bna/bnad_ethtool.c | 6 +- .../net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- .../ethernet/cavium/thunder/nicvf_ethtool.c | 4 +- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 4 +- .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 4 +- .../ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 4 +- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 +- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 4 +- .../chelsio/inline_crypto/chtls/chtls_main.c | 2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- .../net/ethernet/cisco/enic/enic_ethtool.c | 6 +- drivers/net/ethernet/davicom/dm9000.c | 4 +- drivers/net/ethernet/dec/tulip/de2104x.c | 4 +- drivers/net/ethernet/dec/tulip/dmfe.c | 4 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 4 +- drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 4 +- drivers/net/ethernet/dlink/dl2k.c | 4 +- drivers/net/ethernet/dlink/sundance.c | 4 +- drivers/net/ethernet/dnet.c | 4 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 16 +++-- .../net/ethernet/emulex/benet/be_ethtool.c | 6 +- drivers/net/ethernet/faraday/ftgmac100.c | 5 +- drivers/net/ethernet/faraday/ftmac100.c | 5 +- drivers/net/ethernet/fealnx.c | 4 +- .../ethernet/freescale/dpaa/dpaa_ethtool.c | 5 +- .../ethernet/freescale/dpaa2/dpaa2-ethtool.c | 8 +-- .../net/ethernet/freescale/dpaa2/dpaa2-mac.c | 2 +- .../ethernet/freescale/enetc/enetc_ethtool.c | 4 +- drivers/net/ethernet/freescale/fec_main.c | 9 +-- drivers/net/ethernet/freescale/fec_ptp.c | 2 +- .../ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- .../net/ethernet/freescale/gianfar_ethtool.c | 2 +- .../net/ethernet/freescale/ucc_geth_ethtool.c | 4 +- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 4 +- drivers/net/ethernet/google/gve/gve_ethtool.c | 6 +- drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +- .../net/ethernet/huawei/hinic/hinic_ethtool.c | 4 +- drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 4 +- drivers/net/ethernet/ibm/emac/core.c | 4 +- drivers/net/ethernet/ibm/ibmveth.c | 4 +- drivers/net/ethernet/ibm/ibmvnic.c | 6 +- drivers/net/ethernet/intel/e100.c | 5 +- .../net/ethernet/intel/e1000/e1000_ethtool.c | 5 +- drivers/net/ethernet/intel/e1000e/ethtool.c | 4 +- drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- .../net/ethernet/intel/i40e/i40e_ethtool.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 16 ++--- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- .../net/ethernet/intel/iavf/iavf_ethtool.c | 6 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 +- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/intel/igbvf/ethtool.c | 4 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 4 +- .../net/ethernet/intel/ixgb/ixgb_ethtool.c | 5 +- .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 6 +- drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- drivers/net/ethernet/intel/ixgbevf/ethtool.c | 4 +- drivers/net/ethernet/jme.c | 6 +- drivers/net/ethernet/korina.c | 6 +- drivers/net/ethernet/lantiq_etop.c | 6 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 8 +-- drivers/net/ethernet/marvell/mvneta.c | 7 +- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 7 +- .../marvell/octeontx2/nic/otx2_ethtool.c | 8 +-- .../marvell/prestera/prestera_ethtool.c | 4 +- drivers/net/ethernet/marvell/pxa168_eth.c | 8 +-- drivers/net/ethernet/marvell/skge.c | 6 +- drivers/net/ethernet/marvell/sky2.c | 6 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 6 +- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- .../net/ethernet/mellanox/mlx4/en_ethtool.c | 7 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 3 +- .../ethernet/mellanox/mlx5/core/en_ethtool.c | 7 +- .../net/ethernet/mellanox/mlx5/core/en_rep.c | 6 +- .../mellanox/mlx5/core/ipoib/ethtool.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 4 +- .../mellanox/mlxsw/spectrum_ethtool.c | 6 +- .../net/ethernet/mellanox/mlxsw/switchx2.c | 7 +- drivers/net/ethernet/micrel/ks8851_common.c | 6 +- drivers/net/ethernet/micrel/ksz884x.c | 6 +- drivers/net/ethernet/microchip/enc28j60.c | 8 +-- drivers/net/ethernet/microchip/encx24j600.c | 6 +- .../net/ethernet/microchip/lan743x_ethtool.c | 6 +- .../net/ethernet/myricom/myri10ge/myri10ge.c | 8 +-- drivers/net/ethernet/natsemi/natsemi.c | 6 +- drivers/net/ethernet/natsemi/ns83820.c | 7 +- drivers/net/ethernet/neterion/s2io.c | 6 +- .../net/ethernet/neterion/vxge/vxge-ethtool.c | 8 +-- .../net/ethernet/neterion/vxge/vxge-main.c | 2 +- .../ethernet/netronome/nfp/nfp_net_ethtool.c | 6 +- drivers/net/ethernet/ni/nixge.c | 4 +- drivers/net/ethernet/nvidia/forcedeth.c | 6 +- drivers/net/ethernet/nxp/lpc_eth.c | 6 +- .../oki-semi/pch_gbe/pch_gbe_ethtool.c | 7 +- drivers/net/ethernet/packetengines/hamachi.c | 6 +- .../net/ethernet/packetengines/yellowfin.c | 6 +- .../ethernet/pensando/ionic/ionic_ethtool.c | 6 +- .../net/ethernet/pensando/ionic/ionic_lif.c | 2 +- .../qlogic/netxen/netxen_nic_ethtool.c | 6 +- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- .../net/ethernet/qlogic/qede/qede_ethtool.c | 4 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/qlogic/qla3xxx.c | 6 +- .../ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 6 +- .../net/ethernet/qualcomm/emac/emac-ethtool.c | 2 +- drivers/net/ethernet/qualcomm/qca_debug.c | 8 +-- drivers/net/ethernet/rdc/r6040.c | 6 +- drivers/net/ethernet/realtek/8139cp.c | 6 +- drivers/net/ethernet/realtek/8139too.c | 6 +- drivers/net/ethernet/realtek/r8169_main.c | 8 +-- drivers/net/ethernet/rocker/rocker_main.c | 4 +- .../ethernet/samsung/sxgbe/sxgbe_ethtool.c | 4 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/efx_common.c | 2 +- drivers/net/ethernet/sfc/ethtool_common.c | 7 +- drivers/net/ethernet/sfc/falcon/efx.c | 4 +- drivers/net/ethernet/sfc/falcon/ethtool.c | 9 +-- drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- drivers/net/ethernet/sfc/falcon/nic.c | 2 +- drivers/net/ethernet/sfc/mcdi_mon.c | 2 +- drivers/net/ethernet/sfc/nic.c | 2 +- drivers/net/ethernet/sgi/ioc3-eth.c | 6 +- drivers/net/ethernet/sis/sis190.c | 7 +- drivers/net/ethernet/sis/sis900.c | 6 +- drivers/net/ethernet/smsc/epic100.c | 6 +- drivers/net/ethernet/smsc/smc911x.c | 6 +- drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- drivers/net/ethernet/smsc/smc91x.c | 6 +- drivers/net/ethernet/smsc/smsc911x.c | 6 +- drivers/net/ethernet/smsc/smsc9420.c | 6 +- drivers/net/ethernet/socionext/netsec.c | 4 +- drivers/net/ethernet/socionext/sni_ave.c | 4 +- .../ethernet/stmicro/stmmac/stmmac_ethtool.c | 9 +-- drivers/net/ethernet/sun/cassini.c | 6 +- drivers/net/ethernet/sun/ldmvsw.c | 4 +- drivers/net/ethernet/sun/niu.c | 8 +-- drivers/net/ethernet/sun/sunbmac.c | 4 +- drivers/net/ethernet/sun/sungem.c | 6 +- drivers/net/ethernet/sun/sunhme.c | 7 +- drivers/net/ethernet/sun/sunqe.c | 4 +- drivers/net/ethernet/sun/sunvnet.c | 4 +- .../net/ethernet/synopsys/dwc-xlgmac-common.c | 4 +- .../ethernet/synopsys/dwc-xlgmac-ethtool.c | 6 +- drivers/net/ethernet/tehuti/tehuti.c | 8 +-- drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 4 +- drivers/net/ethernet/ti/cpmac.c | 4 +- drivers/net/ethernet/ti/cpsw.c | 6 +- drivers/net/ethernet/ti/cpsw_new.c | 6 +- drivers/net/ethernet/ti/davinci_emac.c | 4 +- drivers/net/ethernet/ti/tlan.c | 8 +-- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 4 +- .../net/ethernet/toshiba/spider_net_ethtool.c | 8 +-- drivers/net/ethernet/toshiba/tc35815.c | 6 +- drivers/net/ethernet/via/via-rhine.c | 4 +- drivers/net/ethernet/via/via-velocity.c | 10 +-- drivers/net/ethernet/wiznet/w5100.c | 6 +- drivers/net/ethernet/wiznet/w5300.c | 6 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 4 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 +- drivers/net/fjes/fjes_ethtool.c | 6 +- drivers/net/geneve.c | 4 +- drivers/net/hyperv/netvsc_drv.c | 4 +- drivers/net/ipvlan/ipvlan_main.c | 4 +- drivers/net/macvlan.c | 4 +- drivers/net/net_failover.c | 4 +- drivers/net/netconsole.c | 10 +-- drivers/net/ntb_netdev.c | 6 +- drivers/net/phy/adin.c | 4 +- drivers/net/phy/bcm-phy-lib.c | 4 +- drivers/net/phy/marvell.c | 2 +- drivers/net/phy/micrel.c | 4 +- drivers/net/phy/mscc/mscc_main.c | 4 +- drivers/net/phy/phy_device.c | 2 +- drivers/net/rionet.c | 8 +-- drivers/net/team/team.c | 4 +- drivers/net/tun.c | 8 +-- drivers/net/usb/aqc111.c | 2 +- drivers/net/usb/asix_common.c | 4 +- drivers/net/usb/catc.c | 4 +- drivers/net/usb/pegasus.c | 4 +- drivers/net/usb/r8152.c | 8 +-- drivers/net/usb/rtl8150.c | 4 +- drivers/net/usb/sierra_net.c | 4 +- drivers/net/usb/usbnet.c | 4 +- drivers/net/veth.c | 4 +- drivers/net/virtio_net.c | 6 +- drivers/net/vmxnet3/vmxnet3_ethtool.c | 6 +- drivers/net/vrf.c | 4 +- drivers/net/vxlan.c | 4 +- drivers/net/wimax/i2400m/netdev.c | 8 +-- drivers/net/wimax/i2400m/usb.c | 4 +- drivers/net/wireless/ath/ath10k/coredump.c | 6 +- drivers/net/wireless/ath/ath10k/qmi.c | 5 +- drivers/net/wireless/ath/ath11k/qmi.c | 6 +- drivers/net/wireless/ath/ath6kl/init.c | 4 +- drivers/net/wireless/ath/carl9170/fw.c | 2 +- drivers/net/wireless/ath/wil6210/main.c | 2 +- drivers/net/wireless/ath/wil6210/netdev.c | 2 +- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- drivers/net/wireless/atmel/atmel.c | 3 +- drivers/net/wireless/broadcom/b43/leds.c | 2 +- .../net/wireless/broadcom/b43legacy/leds.c | 2 +- .../broadcom/brcm80211/brcmfmac/common.c | 8 +-- .../broadcom/brcm80211/brcmfmac/core.c | 8 +-- .../broadcom/brcm80211/brcmfmac/firmware.c | 5 +- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- drivers/net/wireless/intel/ipw2x00/ipw2100.c | 6 +- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 7 +- .../net/wireless/intel/iwlegacy/3945-mac.c | 2 +- .../wireless/intersil/hostap/hostap_ioctl.c | 2 +- .../wireless/intersil/prism54/islpci_dev.c | 4 +- .../net/wireless/marvell/libertas/ethtool.c | 4 +- drivers/net/wireless/marvell/mwifiex/main.c | 3 +- .../mediatek/mt76/mt7615/mt7615_trace.h | 2 +- .../wireless/mediatek/mt76/mt76x02_trace.h | 2 +- drivers/net/wireless/mediatek/mt76/trace.h | 2 +- .../net/wireless/mediatek/mt76/usb_trace.h | 2 +- drivers/net/wireless/mediatek/mt7601u/trace.h | 2 +- drivers/net/wireless/microchip/wilc1000/mon.c | 2 +- .../net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- .../net/wireless/quantenna/qtnfmac/commands.c | 2 +- .../wireless/realtek/rtl818x/rtl8187/leds.c | 2 +- drivers/net/wireless/wl3501_cs.c | 8 +-- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/fabrics.c | 2 +- drivers/nvme/target/admin-cmd.c | 2 +- drivers/nvme/target/discovery.c | 2 +- drivers/of/base.c | 2 +- drivers/of/fdt.c | 6 +- drivers/of/unittest.c | 2 +- drivers/parisc/led.c | 2 +- drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- drivers/platform/x86/i2c-multi-instantiate.c | 2 +- .../platform/x86/intel_cht_int33fe_typec.c | 6 +- drivers/platform/x86/surface3_power.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 5 +- drivers/remoteproc/qcom_sysmon.c | 2 +- drivers/rpmsg/qcom_glink_ssr.c | 2 +- drivers/s390/block/dasd_devmap.c | 2 +- drivers/s390/block/dasd_eer.c | 4 +- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/char/diag_ftp.c | 4 +- drivers/s390/char/hmcdrv_cache.c | 2 +- drivers/s390/char/sclp_ftp.c | 6 +- drivers/s390/char/tape_class.c | 4 +- drivers/s390/cio/qdio_debug.c | 2 +- drivers/s390/net/ctcm_main.c | 2 +- drivers/s390/net/fsm.c | 2 +- drivers/s390/net/qeth_ethtool.c | 4 +- drivers/s390/scsi/zfcp_aux.c | 2 +- drivers/s390/scsi/zfcp_fc.c | 10 +-- drivers/scsi/3w-9xxx.c | 2 +- drivers/scsi/aacraid/aachba.c | 4 +- drivers/scsi/bfa/bfa_fcbuild.c | 4 +- drivers/scsi/bfa/bfa_fcs.c | 6 +- drivers/scsi/bfa/bfa_fcs_lport.c | 25 ++++--- drivers/scsi/bfa/bfa_ioc.c | 2 +- drivers/scsi/bfa/bfa_svc.c | 2 +- drivers/scsi/bfa/bfad.c | 10 +-- drivers/scsi/bfa/bfad_attr.c | 4 +- drivers/scsi/bfa/bfad_bsg.c | 6 +- drivers/scsi/bfa/bfad_im.c | 2 +- drivers/scsi/bnx2i/bnx2i_init.c | 2 +- drivers/scsi/fcoe/fcoe_transport.c | 2 +- drivers/scsi/gdth.c | 6 +- drivers/scsi/ibmvscsi/ibmvscsi.c | 8 +-- drivers/scsi/lpfc/lpfc_attr.c | 6 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/ncr53c8xx.c | 2 +- drivers/scsi/qedi/qedi_main.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 16 ++--- drivers/scsi/qla2xxx/qla_mr.c | 20 +++--- drivers/scsi/qla4xxx/ql4_mbx.c | 8 +-- drivers/scsi/qla4xxx/ql4_os.c | 14 ++-- drivers/scsi/smartpqi/smartpqi_init.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/scsi/ufs/ufs-qcom.c | 2 +- drivers/soc/fsl/qe/qe.c | 5 +- drivers/soc/qcom/smp2p.c | 2 +- drivers/spi/spi.c | 4 +- drivers/staging/comedi/comedi_fops.c | 4 +- .../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/qlge/qlge_ethtool.c | 6 +- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- .../staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 +- .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- drivers/staging/sm750fb/sm750.c | 2 +- .../target/iscsi/iscsi_target_parameters.c | 4 +- drivers/target/iscsi/iscsi_target_util.c | 12 ++-- drivers/target/target_core_configfs.c | 44 +++++-------- drivers/target/target_core_device.c | 6 +- drivers/target/target_core_user.c | 4 +- drivers/thermal/thermal_core.c | 4 +- drivers/thermal/thermal_hwmon.c | 2 +- drivers/tty/hvc/hvcs.c | 2 +- drivers/tty/serial/earlycon.c | 6 +- drivers/tty/serial/serial_core.c | 2 +- drivers/tty/serial/sunsu.c | 6 +- drivers/tty/serial/sunzilog.c | 9 ++- drivers/tty/vt/keyboard.c | 7 +- drivers/usb/atm/usbatm.c | 2 +- drivers/usb/core/devio.c | 3 +- drivers/usb/gadget/function/f_fs.c | 2 +- drivers/usb/gadget/function/f_midi.c | 4 +- drivers/usb/gadget/function/f_printer.c | 8 +-- drivers/usb/gadget/function/f_uvc.c | 2 +- drivers/usb/gadget/function/u_audio.c | 6 +- drivers/usb/gadget/function/u_ether.c | 8 +-- drivers/usb/gadget/function/uvc_v4l2.c | 6 +- drivers/usb/gadget/udc/omap_udc.c | 2 +- drivers/usb/misc/usb251xb.c | 6 +- drivers/usb/storage/onetouch.c | 2 +- drivers/usb/typec/tcpm/fusb302.c | 2 +- drivers/usb/usbip/stub_main.c | 8 +-- drivers/video/console/sticore.c | 2 +- drivers/video/fbdev/aty/atyfb_base.c | 2 +- drivers/video/fbdev/aty/radeon_base.c | 2 +- drivers/video/fbdev/bw2.c | 2 +- drivers/video/fbdev/cirrusfb.c | 2 +- drivers/video/fbdev/clps711x-fb.c | 2 +- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/cyber2000fb.c | 8 +-- drivers/video/fbdev/ffb.c | 2 +- drivers/video/fbdev/geode/gx1fb_core.c | 8 ++- drivers/video/fbdev/gxt4500.c | 2 +- drivers/video/fbdev/i740fb.c | 2 +- drivers/video/fbdev/imxfb.c | 2 +- drivers/video/fbdev/matrox/matroxfb_base.c | 7 +- .../video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- drivers/video/fbdev/pxa168fb.c | 2 +- drivers/video/fbdev/pxafb.c | 2 +- drivers/video/fbdev/s3fb.c | 2 +- drivers/video/fbdev/simplefb.c | 2 +- drivers/video/fbdev/sis/sis_main.c | 4 +- drivers/video/fbdev/sm501fb.c | 2 +- drivers/video/fbdev/sstfb.c | 2 +- drivers/video/fbdev/sunxvr1000.c | 2 +- drivers/video/fbdev/sunxvr2500.c | 2 +- drivers/video/fbdev/sunxvr500.c | 2 +- drivers/video/fbdev/tcx.c | 2 +- drivers/video/fbdev/tdfxfb.c | 4 +- drivers/video/fbdev/tgafb.c | 2 +- drivers/video/fbdev/tridentfb.c | 2 +- drivers/virt/vboxguest/vboxguest_core.c | 3 +- drivers/w1/masters/sgi_w1.c | 2 +- drivers/watchdog/diag288_wdt.c | 12 ++-- drivers/xen/xen-scsiback.c | 2 +- drivers/xen/xenbus/xenbus_probe_frontend.c | 2 +- fs/9p/vfs_inode.c | 4 +- fs/affs/super.c | 2 +- fs/befs/btree.c | 2 +- fs/befs/linuxvfs.c | 2 +- fs/btrfs/check-integrity.c | 2 +- fs/char_dev.c | 2 +- fs/cifs/cifs_unicode.c | 2 +- fs/cifs/cifsroot.c | 2 +- fs/cifs/connect.c | 2 +- fs/cifs/smb2pdu.c | 2 +- fs/dlm/config.c | 6 +- fs/exec.c | 2 +- fs/ext4/file.c | 2 +- fs/gfs2/ops_fstype.c | 10 +-- fs/hostfs/hostfs_kern.c | 2 +- fs/kernfs/dir.c | 27 ++++---- fs/lockd/host.c | 2 +- fs/nfs/nfs4client.c | 2 +- fs/nfs/nfsroot.c | 4 +- fs/nfsd/nfs4idmap.c | 8 +-- fs/nfsd/nfssvc.c | 3 +- fs/ocfs2/dlmfs/dlmfs.c | 2 +- fs/ocfs2/stackglue.c | 4 +- fs/ocfs2/super.c | 10 +-- fs/proc/kcore.c | 2 +- fs/reiserfs/procfs.c | 4 +- fs/super.c | 4 +- fs/vboxsf/super.c | 2 +- include/linux/gameport.h | 2 +- include/linux/suspend.h | 2 +- include/rdma/rdma_vt.h | 2 +- include/trace/events/kyber.h | 8 +-- include/trace/events/task.h | 2 +- include/trace/events/wbt.h | 8 +-- init/do_mounts.c | 2 +- init/main.c | 4 +- kernel/acct.c | 2 +- kernel/cgroup/cgroup-v1.c | 4 +- kernel/cgroup/cgroup.c | 2 +- kernel/events/core.c | 6 +- kernel/kallsyms.c | 4 +- kernel/kprobes.c | 2 +- kernel/module.c | 17 +++-- kernel/params.c | 2 +- kernel/printk/printk.c | 2 +- kernel/relay.c | 4 +- kernel/sched/fair.c | 6 +- kernel/time/clocksource.c | 2 +- kernel/trace/ftrace.c | 19 +++--- kernel/trace/trace.c | 8 +-- kernel/trace/trace_boot.c | 8 +-- kernel/trace/trace_events.c | 2 +- kernel/trace/trace_events_inject.c | 6 +- kernel/trace/trace_kprobe.c | 2 +- kernel/trace/trace_probe.c | 2 +- kernel/trace/trace_uprobe.c | 11 ++-- lib/dynamic_debug.c | 2 +- lib/earlycpio.c | 2 +- lib/kobject_uevent.c | 6 +- mm/dmapool.c | 2 +- mm/kasan/report.c | 2 +- mm/zswap.c | 2 +- net/8021q/vlan_dev.c | 6 +- net/ax25/af_ax25.c | 2 +- net/bluetooth/hidp/core.c | 6 +- net/bridge/br_device.c | 8 +-- net/bridge/br_sysfs_if.c | 4 +- net/bridge/netfilter/ebtables.c | 2 +- net/caif/caif_dev.c | 3 +- net/caif/caif_usb.c | 2 +- net/caif/cfcnfg.c | 4 +- net/caif/cfctrl.c | 2 +- net/core/dev.c | 6 +- net/core/devlink.c | 6 +- net/core/drop_monitor.c | 2 +- net/core/netpoll.c | 4 +- net/dsa/master.c | 2 +- net/dsa/slave.c | 6 +- net/ethtool/ioctl.c | 6 +- net/ieee802154/trace.h | 2 +- net/ipv4/arp.c | 2 +- net/ipv4/ip_tunnel.c | 4 +- net/ipv4/ipconfig.c | 10 +-- net/ipv6/ip6_gre.c | 2 +- net/ipv6/ip6_tunnel.c | 2 +- net/ipv6/ip6_vti.c | 2 +- net/ipv6/sit.c | 2 +- net/l2tp/l2tp_eth.c | 4 +- net/mac80211/iface.c | 2 +- net/mac80211/trace.h | 2 +- net/mac802154/trace.h | 2 +- net/netfilter/ipset/ip_set_core.c | 4 +- net/netfilter/ipset/ip_set_hash_netiface.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 8 +-- net/netfilter/nf_log.c | 4 +- net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nft_osf.c | 2 +- net/netfilter/x_tables.c | 20 +++--- net/netfilter/xt_RATEEST.c | 2 +- net/openvswitch/vport-internal_dev.c | 2 +- net/packet/af_packet.c | 4 +- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- net/sched/sch_teql.c | 2 +- net/sunrpc/clnt.c | 6 +- net/sunrpc/svc.c | 8 +-- net/sunrpc/xprtsock.c | 2 +- net/wireless/ethtool.c | 12 ++-- net/wireless/trace.h | 2 +- samples/trace_events/trace-events-sample.h | 2 +- samples/v4l/v4l2-pci-skeleton.c | 10 +-- security/integrity/ima/ima_api.c | 2 +- security/integrity/ima/ima_policy.c | 8 ++- security/keys/request_key_auth.c | 2 +- sound/aoa/codecs/onyx.c | 2 +- sound/aoa/codecs/tas.c | 2 +- sound/aoa/codecs/toonie.c | 2 +- sound/aoa/core/alsa.c | 9 +-- sound/aoa/fabrics/layout.c | 8 +-- sound/aoa/soundbus/sysfs.c | 2 +- sound/arm/aaci.c | 7 +- sound/arm/pxa2xx-ac97.c | 2 +- sound/core/compress_offload.c | 2 +- sound/core/control.c | 16 ++--- sound/core/ctljack.c | 2 +- sound/core/hwdep.c | 6 +- sound/core/init.c | 4 +- sound/core/oss/mixer_oss.c | 19 ++++-- sound/core/pcm.c | 2 +- sound/core/pcm_native.c | 6 +- sound/core/rawmidi.c | 2 +- sound/core/seq/oss/seq_oss_midi.c | 4 +- sound/core/seq/oss/seq_oss_synth.c | 6 +- sound/core/seq/seq_clientmgr.c | 2 +- sound/core/seq/seq_ports.c | 6 +- sound/core/timer.c | 10 +-- sound/core/timer_compat.c | 4 +- sound/drivers/opl3/opl3_oss.c | 2 +- sound/drivers/opl3/opl3_synth.c | 2 +- sound/firewire/bebob/bebob_hwdep.c | 2 +- sound/firewire/dice/dice-hwdep.c | 2 +- sound/firewire/digi00x/digi00x-hwdep.c | 2 +- sound/firewire/fireface/ff-hwdep.c | 2 +- sound/firewire/fireworks/fireworks_hwdep.c | 2 +- sound/firewire/motu/motu-hwdep.c | 2 +- sound/firewire/oxfw/oxfw-hwdep.c | 2 +- sound/firewire/tascam/tascam-hwdep.c | 2 +- sound/i2c/i2c.c | 4 +- sound/isa/ad1848/ad1848.c | 4 +- sound/isa/cs423x/cs4231.c | 4 +- sound/isa/cs423x/cs4236.c | 4 +- sound/isa/es1688/es1688.c | 4 +- sound/isa/sb/sb16_csp.c | 3 +- sound/isa/sb/sb_mixer.c | 2 +- sound/oss/dmasound/dmasound_core.c | 4 +- sound/pci/cs5535audio/cs5535audio_olpc.c | 4 +- sound/pci/ctxfi/ctpcm.c | 2 +- sound/pci/emu10k1/emu10k1.c | 4 +- sound/pci/emu10k1/emu10k1_main.c | 2 +- sound/pci/emu10k1/emufx.c | 7 +- sound/pci/es1968.c | 2 +- sound/pci/fm801.c | 2 +- sound/pci/hda/hda_auto_parser.c | 2 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_controller.c | 2 +- sound/pci/hda/hda_eld.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/hda_jack.c | 2 +- sound/pci/ice1712/juli.c | 2 +- sound/pci/ice1712/psc724.c | 8 +-- sound/pci/ice1712/quartet.c | 2 +- sound/pci/ice1712/wm8776.c | 2 +- sound/pci/lola/lola.c | 2 +- sound/pci/lola/lola_pcm.c | 2 +- sound/pci/rme9652/hdspm.c | 4 +- sound/ppc/keywest.c | 2 +- sound/soc/qcom/qdsp6/q6afe.c | 4 +- sound/soc/sh/rcar/core.c | 2 +- sound/usb/bcd2000/bcd2000.c | 2 +- sound/usb/caiaq/audio.c | 2 +- sound/usb/caiaq/device.c | 6 +- sound/usb/caiaq/midi.c | 2 +- sound/usb/card.c | 8 +-- sound/usb/hiface/chip.c | 8 ++- sound/usb/hiface/pcm.c | 2 +- sound/usb/mixer.c | 19 +++--- sound/usb/mixer_quirks.c | 3 +- sound/usb/mixer_scarlett.c | 2 +- sound/usb/mixer_scarlett_gen2.c | 2 +- sound/usb/mixer_us16x08.c | 2 +- sound/x86/intel_hdmi_audio.c | 2 +- sound/xen/xen_snd_front_cfg.c | 2 +- tools/perf/arch/x86/util/event.c | 2 +- tools/perf/arch/x86/util/machine.c | 2 +- tools/perf/builtin-buildid-cache.c | 6 +- tools/perf/jvmti/libjvmti.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/util/annotate.c | 2 +- tools/perf/util/auxtrace.c | 2 +- tools/perf/util/dso.c | 2 +- .../util/intel-pt-decoder/intel-pt-decoder.c | 2 +- tools/perf/util/llvm-utils.c | 4 +- tools/perf/util/machine.c | 6 +- tools/perf/util/parse-events.c | 2 +- tools/perf/util/probe-file.c | 2 +- tools/perf/util/svghelper.c | 2 +- tools/perf/util/symbol.c | 2 +- tools/perf/util/synthetic-events.c | 4 +- 928 files changed, 1904 insertions(+), 1860 deletions(-)--
2.29.2