From nobody Sun Feb 8 22:05:44 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12DB8C0015E for ; Mon, 24 Jul 2023 12:03:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230166AbjGXMDv (ORCPT ); Mon, 24 Jul 2023 08:03:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230143AbjGXMDi (ORCPT ); Mon, 24 Jul 2023 08:03:38 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 618061BF for ; Mon, 24 Jul 2023 05:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690200169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lSRQBULx+TvRi9w0R85wybLn1zR6qk9EVDsaRk1ameQ=; b=dkUq9EQYpKRYePIy58gch6h4nocspdZWdVNGs5U4fjGiZzrPlQHH3LUcqoZLultvZhfo3y fOpxyUqSrlGdh9A8fVx+gt969hnfKq5G1Q8sOUUTHZ2uWTejwLWDn/uIQxQXgo/cPyd2ad c8d+j6SKF3Y2XbCWyZQwWUFLgNRCnfQ= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-LkaPnEg9PgulEKUeZ7-pKw-1; Mon, 24 Jul 2023 08:02:43 -0400 X-MC-Unique: LkaPnEg9PgulEKUeZ7-pKw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1FA3A3827907; Mon, 24 Jul 2023 12:02:43 +0000 (UTC) Received: from localhost (dhcp-10-40-5-80.brq.redhat.com [10.40.5.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id C64B6C2C856; Mon, 24 Jul 2023 12:02:42 +0000 (UTC) From: Oleksandr Natalenko To: linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org, Saurav Kashyap , Javed Hasan , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" , "Martin K. Petersen" , Jozef Bacik , Laurence Oberman , Rob Evers Subject: [RFC PATCH 1/3] scsi: qedf: do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly Date: Mon, 24 Jul 2023 14:02:39 +0200 Message-ID: <20230724120241.40495-2-oleksandr@redhat.com> In-Reply-To: <20230724120241.40495-1-oleksandr@redhat.com> References: <20230724120241.40495-1-oleksandr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The qedf_dbg_stop_io_on_error_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 sprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call. Signed-off-by: Oleksandr Natalenko Reviewed-by: Laurence Oberman Tested-by: Laurence Oberman --- 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_debu= gfs.c index a3ed681c8ce3f..4d1b99569d490 100644 --- a/drivers/scsi/qedf/qedf_debugfs.c +++ b/drivers/scsi/qedf/qedf_debugfs.c @@ -185,18 +185,17 @@ qedf_dbg_stop_io_on_error_cmd_read(struct file *filp,= char __user *buffer, size_t count, loff_t *ppos) { int cnt; + char cbuf[7]; struct qedf_dbg_ctx *qedf_dbg =3D (struct qedf_dbg_ctx *)filp->private_data; struct qedf_ctx *qedf =3D container_of(qedf_dbg, struct qedf_ctx, dbg_ctx); =20 QEDF_INFO(qedf_dbg, QEDF_LOG_DEBUGFS, "entered\n"); - cnt =3D sprintf(buffer, "%s\n", + cnt =3D sprintf(cbuf, "%s\n", qedf->stop_io_on_error ? "true" : "false"); =20 - cnt =3D min_t(int, count, cnt - *ppos); - *ppos +=3D cnt; - return cnt; + return simple_read_from_buffer(buffer, count, ppos, cbuf, cnt); } =20 static ssize_t --=20 2.41.0 From nobody Sun Feb 8 22:05:44 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28E09C0015E for ; Mon, 24 Jul 2023 12:03:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbjGXMDs (ORCPT ); Mon, 24 Jul 2023 08:03:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbjGXMDi (ORCPT ); Mon, 24 Jul 2023 08:03:38 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7778CE43 for ; Mon, 24 Jul 2023 05:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690200169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5cbGLzsOpszIW29iDt5MpDYjv/Oe38KhgfInWeAU+S0=; b=CkipfAxS6tqmQvYvu9JAO3h8GLUKqEHWTaI3AizbRbPQcIRnRbpmt2wsO/Uct3DxN+Vzce KGk259CUoNg1/2qI3TD8mMhOh35fTl/WzPDd99PbxDYXGUBBdOcZKAkDKGQb/CWoKp0DX9 O7TowHs8zy6pb8/MKS5u/kD/FUboLAg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-513-oPGyuEgjOnOPAtmfaLM47g-1; Mon, 24 Jul 2023 08:02:44 -0400 X-MC-Unique: oPGyuEgjOnOPAtmfaLM47g-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0DB3E809F8F; Mon, 24 Jul 2023 12:02:44 +0000 (UTC) Received: from localhost (dhcp-10-40-5-80.brq.redhat.com [10.40.5.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3337492C13; Mon, 24 Jul 2023 12:02:43 +0000 (UTC) From: Oleksandr Natalenko To: linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org, Saurav Kashyap , Javed Hasan , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" , "Martin K. Petersen" , Jozef Bacik , Laurence Oberman , Rob Evers Subject: [RFC PATCH 2/3] scsi: qedf: do not touch __user pointer in qedf_dbg_debug_cmd_read() directly Date: Mon, 24 Jul 2023 14:02:40 +0200 Message-ID: <20230724120241.40495-3-oleksandr@redhat.com> In-Reply-To: <20230724120241.40495-1-oleksandr@redhat.com> References: <20230724120241.40495-1-oleksandr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 sprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call. Signed-off-by: Oleksandr Natalenko Reviewed-by: Laurence Oberman Tested-by: Laurence Oberman --- 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_debu= gfs.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 __use= r *buffer, size_t count, loff_t *ppos) { int cnt; + char cbuf[35]; struct qedf_dbg_ctx *qedf_dbg =3D (struct qedf_dbg_ctx *)filp->private_data; =20 QEDF_INFO(qedf_dbg, QEDF_LOG_DEBUGFS, "debug mask=3D0x%x\n", qedf_debug); - cnt =3D sprintf(buffer, "debug mask =3D 0x%x\n", qedf_debug); + cnt =3D sprintf(cbuf, "debug mask =3D 0x%x\n", qedf_debug); =20 - cnt =3D min_t(int, count, cnt - *ppos); - *ppos +=3D cnt; - return cnt; + return simple_read_from_buffer(buffer, count, ppos, cbuf, cnt); } =20 static ssize_t --=20 2.41.0 From nobody Sun Feb 8 22:05:44 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBBE6C0015E for ; Mon, 24 Jul 2023 12:03:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230181AbjGXMDy (ORCPT ); Mon, 24 Jul 2023 08:03:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230153AbjGXMDl (ORCPT ); Mon, 24 Jul 2023 08:03:41 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF718E61 for ; Mon, 24 Jul 2023 05:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690200170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q6dlAfJE+Uq5H6USgolHQ9RHH+YwIscLGk0H+vxgGw8=; b=dVk5cZy6EtlJFnCbNFakAJWeLL0cwI2vMhMK6Ch9IIWwOxLFXZxuzvZJInnms4tL39Ud5f RJxpt+HwxHr3IqybVRAJdfnXvzHTUu5YEFMYPQWGCllo6KvRhR6PaiwYjU9Kk8A6vok6i1 lZ5z33SCgEDo9D6oNQcHnNLG6YlRZXA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-679-lPRFhz7cP-iWFybwFKXSEg-1; Mon, 24 Jul 2023 08:02:45 -0400 X-MC-Unique: lPRFhz7cP-iWFybwFKXSEg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 04DFC810BB2; Mon, 24 Jul 2023 12:02:45 +0000 (UTC) Received: from localhost (dhcp-10-40-5-80.brq.redhat.com [10.40.5.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1507400F1F; Mon, 24 Jul 2023 12:02:44 +0000 (UTC) From: Oleksandr Natalenko To: linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org, Saurav Kashyap , Javed Hasan , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" , "Martin K. Petersen" , Jozef Bacik , Laurence Oberman , Rob Evers Subject: [RFC PATCH 3/3] scsi: qedf: do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly Date: Mon, 24 Jul 2023 14:02:41 +0200 Message-ID: <20230724120241.40495-4-oleksandr@redhat.com> In-Reply-To: <20230724120241.40495-1-oleksandr@redhat.com> References: <20230724120241.40495-1-oleksandr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The qedf_dbg_fp_int_cmd_read() function invokes sprintf() directly on a __user pointer, which may crash the kernel. Avoid doing that by vmalloc()'ating a buffer for scnprintf() and then calling simple_read_from_buffer() which does a proper copy_to_user() call. Signed-off-by: Oleksandr Natalenko Reviewed-by: Laurence Oberman Tested-by: Laurence Oberman --- drivers/scsi/qedf/qedf_dbg.h | 2 ++ drivers/scsi/qedf/qedf_debugfs.c | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/qedf/qedf_dbg.h b/drivers/scsi/qedf/qedf_dbg.h index f4d81127239eb..5ec2b817c694a 100644 --- a/drivers/scsi/qedf/qedf_dbg.h +++ b/drivers/scsi/qedf/qedf_dbg.h @@ -59,6 +59,8 @@ extern uint qedf_debug; #define QEDF_LOG_NOTICE 0x40000000 /* Notice logs */ #define QEDF_LOG_WARN 0x80000000 /* Warning logs */ =20 +#define QEDF_DEBUGFS_LOG_LEN (2 * PAGE_SIZE) + /* Debug context structure */ struct qedf_dbg_ctx { unsigned int host_no; diff --git a/drivers/scsi/qedf/qedf_debugfs.c b/drivers/scsi/qedf/qedf_debu= gfs.c index f910af0029a2c..6db996b73fe39 100644 --- a/drivers/scsi/qedf/qedf_debugfs.c +++ b/drivers/scsi/qedf/qedf_debugfs.c @@ -8,6 +8,7 @@ #include #include #include +#include =20 #include "qedf.h" #include "qedf_dbg.h" @@ -98,7 +99,9 @@ static ssize_t qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t co= unt, loff_t *ppos) { + ssize_t ret; size_t cnt =3D 0; + char *cbuf; int id; struct qedf_fastpath *fp =3D NULL; struct qedf_dbg_ctx *qedf_dbg =3D @@ -108,19 +111,25 @@ qedf_dbg_fp_int_cmd_read(struct file *filp, char __us= er *buffer, size_t count, =20 QEDF_INFO(qedf_dbg, QEDF_LOG_DEBUGFS, "entered\n"); =20 - cnt =3D sprintf(buffer, "\nFastpath I/O completions\n\n"); + cbuf =3D vmalloc(QEDF_DEBUGFS_LOG_LEN); + if (!cbuf) + return 0; + + cnt +=3D scnprintf(cbuf + cnt, QEDF_DEBUGFS_LOG_LEN - cnt, "\nFastpath I/= O completions\n\n"); =20 for (id =3D 0; id < qedf->num_queues; id++) { fp =3D &(qedf->fp_array[id]); if (fp->sb_id =3D=3D QEDF_SB_ID_NULL) continue; - cnt +=3D sprintf((buffer + cnt), "#%d: %lu\n", id, - fp->completions); + cnt +=3D scnprintf(cbuf + cnt, QEDF_DEBUGFS_LOG_LEN - cnt, + "#%d: %lu\n", id, fp->completions); } =20 - cnt =3D min_t(int, count, cnt - *ppos); - *ppos +=3D cnt; - return cnt; + ret =3D simple_read_from_buffer(buffer, count, ppos, cbuf, cnt); + + vfree(cbuf); + + return ret; } =20 static ssize_t --=20 2.41.0