Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b192b42a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin K. Petersen
Browse files

scsi: fusion: fix string overflow warning 



gcc points out a theorerical string overflow:

drivers/message/fusion/mptbase.c: In function 'mpt_detach':
drivers/message/fusion/mptbase.c:2103:17: error: '%s' directive writing up to 31 bytes into a region of size 28 [-Werror=format-overflow=]
sprintf(pname, MPT_PROCFS_MPTBASEDIR "/%s/summary", ioc->name);
               ^~~~~
drivers/message/fusion/mptbase.c:2103:2: note: 'sprintf' output between 13 and 44 bytes into a destination of size 32

We can simply double the size of the local buffer here to be on the
safe side, and using snprintf() instead of sprintf() protects us
if ioc->name was not terminated properly.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 345ebae7

drivers/message/fusion/mptbase.c

+4 −4
Original line number Diff line number Diff line
@@ -2079,7 +2079,7 @@ void 
mpt_detach(struct pci_dev *pdev)

{

	MPT_ADAPTER 	*ioc = pci_get_drvdata(pdev);

	char pname[32];

	char pname[64];

	u8 cb_idx;

	unsigned long flags;

	struct workqueue_struct *wq;
@@ -2100,11 +2100,11 @@ mpt_detach(struct pci_dev *pdev) 
	spin_unlock_irqrestore(&ioc->fw_event_lock, flags);

	destroy_workqueue(wq);



	sprintf(pname, MPT_PROCFS_MPTBASEDIR "/%s/summary", ioc->name);

	snprintf(pname, sizeof(pname), MPT_PROCFS_MPTBASEDIR "/%s/summary", ioc->name);

	remove_proc_entry(pname, NULL);

	sprintf(pname, MPT_PROCFS_MPTBASEDIR "/%s/info", ioc->name);

	snprintf(pname, sizeof(pname), MPT_PROCFS_MPTBASEDIR "/%s/info", ioc->name);

	remove_proc_entry(pname, NULL);

	sprintf(pname, MPT_PROCFS_MPTBASEDIR "/%s", ioc->name);

	snprintf(pname, sizeof(pname), MPT_PROCFS_MPTBASEDIR "/%s", ioc->name);

	remove_proc_entry(pname, NULL);



	/* call per device driver remove entry point */