linux-kernel - [PATCH v2 2/3] scsi: qedf: do not touch __user pointer in qedf_dbg_debug_cmd

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230731084034.37021-3-oleksandr@redhat.com>
Date:   Mon, 31 Jul 2023 10:40:33 +0200
From:   Oleksandr Natalenko <oleksandr@...hat.com>
To:     linux-kernel@...r.kernel.org
Cc:     linux-scsi@...r.kernel.org, Saurav Kashyap <skashyap@...vell.com>,
        Johannes Thumshirn <Johannes.Thumshirn@....com>,
        David Laight <David.Laight@...LAB.COM>,
        GR-QLogic-Storage-Upstream@...vell.com,
        "James E.J. Bottomley" <jejb@...ux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@...cle.com>,
        Jozef Bacik <jobacik@...hat.com>,
        Laurence Oberman <loberman@...hat.com>,
        Rob Evers <revers@...hat.com>
Subject: [PATCH v2 2/3] scsi: qedf: do not touch __user pointer in qedf_dbg_debug_cmd_read() directly

The qedf_dbg_debug_cmd_read() function invokes sprintf()
directly on a __user pointer, which may crash the kernel.

Avoid doing that by using a small on-stack buffer for scnprintf()
and then calling simple_read_from_buffer() which does a proper
copy_to_user() call.

Fixes: 61d8658b4a ("scsi: qedf: Add QLogic FastLinQ offload FCoE driver framework.")
Link: https://lore.kernel.org/lkml/20230724120241.40495-1-oleksandr@redhat.com/
Link: https://lore.kernel.org/linux-scsi/20230726101236.11922-1-skashyap@marvell.com/
Cc: Saurav Kashyap <skashyap@...vell.com>
Cc: Rob Evers <revers@...hat.com>
Cc: Johannes Thumshirn <Johannes.Thumshirn@....com>
Cc: David Laight <David.Laight@...LAB.COM>
Cc: Jozef Bacik <jobacik@...hat.com>
Cc: Laurence Oberman <loberman@...hat.com>
Cc: "James E.J. Bottomley" <jejb@...ux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@...cle.com>
Cc: GR-QLogic-Storage-Upstream@...vell.com
Cc: linux-scsi@...r.kernel.org
Reviewed-by: Laurence Oberman <loberman@...hat.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@....com>
Tested-by: Laurence Oberman <loberman@...hat.com>
Acked-by: Saurav Kashyap <skashyap@...vell.com>
Signed-off-by: Oleksandr Natalenko <oleksandr@...hat.com>
---
 drivers/scsi/qedf/qedf_debugfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/qedf/qedf_debugfs.c b/drivers/scsi/qedf/qedf_debugfs.c
index 3eb4334ac6a32..1c5716540e465 100644
--- a/drivers/scsi/qedf/qedf_debugfs.c
+++ b/drivers/scsi/qedf/qedf_debugfs.c
@@ -138,15 +138,14 @@ qedf_dbg_debug_cmd_read(struct file *filp, char __user *buffer, size_t count,
 			loff_t *ppos)
 {
 	int cnt;
+	char cbuf[32];
 	struct qedf_dbg_ctx *qedf_dbg =
 				(struct qedf_dbg_ctx *)filp->private_data;
 
 	QEDF_INFO(qedf_dbg, QEDF_LOG_DEBUGFS, "debug mask=0x%x\n", qedf_debug);
-	cnt = sprintf(buffer, "debug mask = 0x%x\n", qedf_debug);
+	cnt = scnprintf(cbuf, sizeof(cbuf), "debug mask = 0x%x\n", qedf_debug);
 
-	cnt = min_t(int, count, cnt - *ppos);
-	*ppos += cnt;
-	return cnt;
+	return simple_read_from_buffer(buffer, count, ppos, cbuf, cnt);
 }
 
 static ssize_t
-- 
2.41.0