Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp3023379rwo; Mon, 24 Jul 2023 05:16:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlFtBgw0C3FB/J50OkJ1qmmu09c4frKpsBeeIrgmC0DHG7SE19VN5hLWZWt+Oqjg+mZm/hJt X-Received: by 2002:a17:902:ab8f:b0:1ac:63ac:10a7 with SMTP id f15-20020a170902ab8f00b001ac63ac10a7mr7476997plr.68.1690200964966; Mon, 24 Jul 2023 05:16:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690200964; cv=none; d=google.com; s=arc-20160816; b=dDjRqdSwwySMMIHFJQEmH0nTDoU9qQ3Cr8/OzhN7I0OJZ2cN33uHDGglGx21OrTxfW M/uEVxFpdVv0qLAg1LbK963eZ2RS318QnBafe7LeDVZ108EHFHugRsce+0VlTjsIXGGp 6L3BB9s+AeYa/hx9wwnk+wFFXX3IA0cUajbB2tQNI/Im8AOIWR1cXYXH4HZqFjV1lz8R z02mTLihM76FmrJcctL9Et/EJpsZj7UzvpEhj7YLf4jhyDlS9q+9a2ErS+IcPDwKi+UU g8K5WUEq8uxFz+kBVdDmVPvPBe0YczNGDPXEqPZNbB9mf2Iz+0CJCXumu9+CMKS254En Bg5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=q6dlAfJE+Uq5H6USgolHQ9RHH+YwIscLGk0H+vxgGw8=; fh=nltHpYi3YoyP0NVhXDe1nu5cQ49IzwbxnGq+K+kbE3c=; b=rv+bBY981SEsvY6slimdxkrrcXQzQkvTi/0yA1ynyfcEhIP8biOGvQ+BMDBl4uJlJ/ w2zXcGoARsmkSVp+OI3MPM8eUraPdUNusGZC5VNdL+b4p+JQkob+kGRXH79e85l7fp05 diy/JwWv907M2x1qcPx26ASECeU8AxfOA+E3EnPzkbggV4WSgEe2grxJzO7V6DLS0TgG Gu+UtNWl3FD/xhOAbPAxYKOefcZGoayADu/xIhYTkGo78SPw4uPlsOo1AdxDALyBCtw+ Fy4AnDpkSZI+Jb1+Y/UkmXN0ohK7meF1kdwJ7P6J0NhA9JpOKDlbeZPj7BQq5Hyz3BWB yx2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dVk5cZy6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ky3-20020a170902f98300b001bb5fd3ea2csi8181963plb.68.2023.07.24.05.15.52; Mon, 24 Jul 2023 05:16:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dVk5cZy6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230157AbjGXMDx (ORCPT + 99 others); Mon, 24 Jul 2023 08:03:53 -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: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 */ +#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_debugfs.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 #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 count, loff_t *ppos) { + ssize_t ret; size_t cnt = 0; + char *cbuf; int id; struct qedf_fastpath *fp = NULL; struct qedf_dbg_ctx *qedf_dbg = @@ -108,19 +111,25 @@ qedf_dbg_fp_int_cmd_read(struct file *filp, char __user *buffer, size_t count, QEDF_INFO(qedf_dbg, QEDF_LOG_DEBUGFS, "entered\n"); - cnt = sprintf(buffer, "\nFastpath I/O completions\n\n"); + cbuf = vmalloc(QEDF_DEBUGFS_LOG_LEN); + if (!cbuf) + return 0; + + cnt += scnprintf(cbuf + cnt, QEDF_DEBUGFS_LOG_LEN - cnt, "\nFastpath I/O completions\n\n"); for (id = 0; id < qedf->num_queues; id++) { fp = &(qedf->fp_array[id]); if (fp->sb_id == QEDF_SB_ID_NULL) continue; - cnt += sprintf((buffer + cnt), "#%d: %lu\n", id, - fp->completions); + cnt += scnprintf(cbuf + cnt, QEDF_DEBUGFS_LOG_LEN - cnt, + "#%d: %lu\n", id, fp->completions); } - cnt = min_t(int, count, cnt - *ppos); - *ppos += cnt; - return cnt; + ret = simple_read_from_buffer(buffer, count, ppos, cbuf, cnt); + + vfree(cbuf); + + return ret; } static ssize_t -- 2.41.0