Avoids unbounded string functions returning the version string. Allow 16 characters for the driver name (actually 7 chars) to stop gcc complaining about possible truncation.
Signed-off-by: David Laight <[email protected]> --- v2: The build test bot reported that the snprintf() can truncate. (I thought that was the entire point of snprintf.) In this case ioc->driver_name is either "mpt2sas" or "mpt3sas" and the version string is like "20.102.00.00". Keep it all happy by using "%.16s.%s" instead of "%s-%s" Note that there are a lot of sprintf() related to these strings. This is one of a group of patches that remove potentially unbounded strcpy() calls. They are mostly replaced by strscpy() or, when strlen() has just been called, with memcpy() (usually including the '\0'). Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such. The changes were made by getting the compiler to detect the calls and then fixing the code by hand. Note that all the changes are only compile tested. Some Makefiles were changed to allow files to contain strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to use sysfs_emit() or seq_printf(). All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.) drivers/scsi/mpt3sas/mpt3sas_ctl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c index 8bb947004885..3488446d38a3 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c +++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c @@ -1225,6 +1225,7 @@ static long _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg) { struct mpt3_ioctl_iocinfo karg; + const char *ver = ""; dctlprintk(ioc, ioc_info(ioc, "%s: enter\n", __func__)); @@ -1241,15 +1242,13 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg) karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn); karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus); karg.firmware_version = ioc->facts.FWVersion.Word; - strcpy(karg.driver_version, ioc->driver_name); - strcat(karg.driver_version, "-"); switch (ioc->hba_mpi_version_belonged) { case MPI2_VERSION: if (ioc->is_warpdrive) karg.adapter_type = MPT2_IOCTL_INTERFACE_SAS2_SSS6200; else karg.adapter_type = MPT2_IOCTL_INTERFACE_SAS2; - strcat(karg.driver_version, MPT2SAS_DRIVER_VERSION); + ver = MPT2SAS_DRIVER_VERSION; break; case MPI25_VERSION: case MPI26_VERSION: @@ -1257,9 +1256,11 @@ _ctl_getiocinfo(struct MPT3SAS_ADAPTER *ioc, void __user *arg) karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS35; else karg.adapter_type = MPT3_IOCTL_INTERFACE_SAS3; - strcat(karg.driver_version, MPT3SAS_DRIVER_VERSION); + ver = MPT3SAS_DRIVER_VERSION; break; } + snprintf(karg.driver_version, sizeof (karg.driver_version), "%.16s-%s", + ioc->driver_name, ver); karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); karg.driver_capability |= MPT3_IOCTL_IOCINFO_DRIVER_CAP_MCTP_PASSTHRU; -- 2.39.5
