From: David Laight <David.Laight@ACULAB.COM>
To: 'Oleksandr Natalenko' <oleksandr@redhat.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
Saurav Kashyap <skashyap@marvell.com>,
Johannes Thumshirn <Johannes.Thumshirn@wdc.com>,
"GR-QLogic-Storage-Upstream@marvell.com"
<GR-QLogic-Storage-Upstream@marvell.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Jozef Bacik <jobacik@redhat.com>,
Laurence Oberman <loberman@redhat.com>,
"Rob Evers" <revers@redhat.com>
Subject: RE: [PATCH 2/3] scsi: qedf: do not touch __user pointer in qedf_dbg_debug_cmd_read() directly
Date: Fri, 28 Jul 2023 15:26:11 +0000 [thread overview]
Message-ID: <2938f701ba56419e861f1bb410831862@AcuMS.aculab.com> (raw)
In-Reply-To: <20230728065819.139694-3-oleksandr@redhat.com>
From: Oleksandr Natalenko
> Sent: 28 July 2023 07:58
>
> The qedf_dbg_debug_cmd_read() function invokes sprintf()
> directly on a __user pointer, which may crash the kernel.
^^^ will
>
> Avoid doing that by using a small on-stack buffer for sprintf()
> and then calling simple_read_from_buffer() which does a proper
> copy_to_user() call.
...
> diff --git a/drivers/scsi/qedf/qedf_debugfs.c b/drivers/scsi/qedf/qedf_debugfs.c
> index 4d1b99569d490..f910af0029a2c 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[35];
Why 35?
I pick a multiple of 8 that if 'enough.
> 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 = sprintf(cbuf, "debug mask = 0x%x\n", qedf_debug);
Use scnprintf() to be sure it doesn't overflow.
Much safer if someone does a quick update or copies the code.
David
>
> - 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
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
next prev parent reply other threads:[~2023-07-28 15:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 6:58 [PATCH 0/3] scsi: qedf: sanitise uaccess Oleksandr Natalenko
2023-07-28 6:58 ` [PATCH 1/3] scsi: qedf: do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly Oleksandr Natalenko
2023-07-28 15:23 ` David Laight
2023-07-31 8:01 ` Oleksandr Natalenko
2023-07-28 6:58 ` [PATCH 2/3] scsi: qedf: do not touch __user pointer in qedf_dbg_debug_cmd_read() directly Oleksandr Natalenko
2023-07-28 15:26 ` David Laight [this message]
2023-07-31 8:11 ` Oleksandr Natalenko
2023-07-28 6:58 ` [PATCH 3/3] scsi: qedf: do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly Oleksandr Natalenko
2023-07-28 7:05 ` [PATCH 0/3] scsi: qedf: sanitise uaccess Oleksandr Natalenko
2023-07-28 7:26 ` [EXT] " Saurav Kashyap
2023-07-28 8:37 ` Johannes Thumshirn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2938f701ba56419e861f1bb410831862@AcuMS.aculab.com \
--to=david.laight@aculab.com \
--cc=GR-QLogic-Storage-Upstream@marvell.com \
--cc=Johannes.Thumshirn@wdc.com \
--cc=jejb@linux.ibm.com \
--cc=jobacik@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=loberman@redhat.com \
--cc=martin.petersen@oracle.com \
--cc=oleksandr@redhat.com \
--cc=revers@redhat.com \
--cc=skashyap@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®