]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: lpfc: Prevent buffer overflow crashes in debugfs with malformed user input
authorJames Smart <jsmart2021@gmail.com>
Fri, 1 Jul 2022 21:14:15 +0000 (14:14 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:38:15 +0000 (11:38 +0200)
[ Upstream commit f8191d40aa612981ce897e66cda6a88db8df17bb ]

Malformed user input to debugfs results in buffer overflow crashes.  Adapt
input string lengths to fit within internal buffers, leaving space for NULL
terminators.

Link: https://lore.kernel.org/r/20220701211425.2708-3-jsmart2021@gmail.com
Co-developed-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/scsi/lpfc/lpfc_debugfs.c

index beaf3a8d206f8096396a95600652262df7a65917..fbc76d69ea0b472008389102450f3d6556e27a29 100644 (file)
@@ -2609,8 +2609,8 @@ lpfc_debugfs_multixripools_write(struct file *file, const char __user *buf,
        struct lpfc_sli4_hdw_queue *qp;
        struct lpfc_multixri_pool *multixri_pool;
 
-       if (nbytes > 64)
-               nbytes = 64;
+       if (nbytes > sizeof(mybuf) - 1)
+               nbytes = sizeof(mybuf) - 1;
 
        memset(mybuf, 0, sizeof(mybuf));
 
@@ -2690,8 +2690,8 @@ lpfc_debugfs_nvmestat_write(struct file *file, const char __user *buf,
        if (!phba->targetport)
                return -ENXIO;
 
-       if (nbytes > 64)
-               nbytes = 64;
+       if (nbytes > sizeof(mybuf) - 1)
+               nbytes = sizeof(mybuf) - 1;
 
        memset(mybuf, 0, sizeof(mybuf));
 
@@ -2828,8 +2828,8 @@ lpfc_debugfs_ioktime_write(struct file *file, const char __user *buf,
        char mybuf[64];
        char *pbuf;
 
-       if (nbytes > 64)
-               nbytes = 64;
+       if (nbytes > sizeof(mybuf) - 1)
+               nbytes = sizeof(mybuf) - 1;
 
        memset(mybuf, 0, sizeof(mybuf));
 
@@ -2956,8 +2956,8 @@ lpfc_debugfs_nvmeio_trc_write(struct file *file, const char __user *buf,
        char mybuf[64];
        char *pbuf;
 
-       if (nbytes > 63)
-               nbytes = 63;
+       if (nbytes > sizeof(mybuf) - 1)
+               nbytes = sizeof(mybuf) - 1;
 
        memset(mybuf, 0, sizeof(mybuf));
 
@@ -3062,8 +3062,8 @@ lpfc_debugfs_hdwqstat_write(struct file *file, const char __user *buf,
        char *pbuf;
        int i;
 
-       if (nbytes > 64)
-               nbytes = 64;
+       if (nbytes > sizeof(mybuf) - 1)
+               nbytes = sizeof(mybuf) - 1;
 
        memset(mybuf, 0, sizeof(mybuf));