Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp917331rwb; Fri, 28 Jul 2023 01:37:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlFt4OYtTK9eWXz4cxgleNcTPi8RoTWQleWEwZWlbf8kLB1vpdQhDcAke59VoSxlTGvgHoHs X-Received: by 2002:a17:902:8a85:b0:1b9:e913:b585 with SMTP id p5-20020a1709028a8500b001b9e913b585mr673044plo.13.1690533477838; Fri, 28 Jul 2023 01:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690533477; cv=none; d=google.com; s=arc-20160816; b=rvs0zuPqSbn9KejuhArbS4Sv1UQk06mca0IHqRpEBT9CGCmihEqsSFIX7IkPJxnLJo x14fvf7kr+FICmzC0sz0EhjGXxJ0toz7Ecu3ygHkDw55eUyNaYF0xWuOAuNdi8FNHb/F YusWqc5q7tnulC4YsUvBPnQlKwZbqZsd1pmJAwLRquS2u7cdYBSVNEsKb3PD+lZoZee0 +itzPLL8aIDVKpk1dAf1VIMcqB90+u0mfH8q5ppJX4tkDVl+5gIRLf7YO2S+ovMW8Z2a ZOfHb9iVH55A7dFCZyM7j8zpo04XC9Xi8DnM4tbfk1vmyDKJ+5nSfFnvZdmuYvJMW5Sd 98ew== 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=8g3K5u6ld8VQPfnAPv8OVfldh/6YKqeR6ZjyYLoq2jo=; fh=dAv1Ib71aGpKrsjFCnb/v7cCBPWI3V3Mal2wSsxq0c0=; b=gNOqusuTxLfYfApD49HRoUIbSpS+PoNJriurOwLK987Zg/HdJdXzZJevXiqY0uEUTb 86Bf53To7Asyigq/qEWehDUbsod+ydMLK9y92A6chQ+pNUPCEWuzqvKsKWz2ieuAharI lucexJVRuu+kvEjZVzOJXS48u+H83yjqN3feQaCpeOAHIt6RlTNGJvBp15v1ZNJWxblp BmuzzkXlmgNMW9pI8TJh5r1bzvuWkwObq8Go8mhsuv6WmDyMFwIBQqhoyYRLpndjd6/7 TDMtijyQLt7eLrD94yuWJ3u7Gi3Awpx8M/S5coC2TJSqht4qlVUmaG0K73M2mUfhafKD iQXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UxOf+Jhe; 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 le8-20020a170902fb0800b001bb0fdbfdc1si2662467plb.199.2023.07.28.01.37.45; Fri, 28 Jul 2023 01:37:57 -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=UxOf+Jhe; 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 S233756AbjG1G7a (ORCPT + 99 others); Fri, 28 Jul 2023 02:59:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233625AbjG1G7Q (ORCPT ); Fri, 28 Jul 2023 02:59:16 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 851401FFF for ; Thu, 27 Jul 2023 23:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690527508; 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=8g3K5u6ld8VQPfnAPv8OVfldh/6YKqeR6ZjyYLoq2jo=; b=UxOf+JheGRpLSIngaNE8vS0JM3Ev+FkqWKMgrSULmyOlHTKFhUl0b0dZ3PpUQ6Tv3jm2ne H8XkB4Bk38ZzDQ2HPTre7jQmvJyDEDOY7kuiJLVUsqY5iwkqnOcfrsBd3UXuE5haY82czQ pbGLe4gP+aYjTedfH0upJPqeU4+ZSsA= 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-544-2GSlm20uPKax2edw8LuRWQ-1; Fri, 28 Jul 2023 02:58:23 -0400 X-MC-Unique: 2GSlm20uPKax2edw8LuRWQ-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 133C185A58A; Fri, 28 Jul 2023 06:58:23 +0000 (UTC) Received: from localhost (unknown [10.45.224.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id C540EC57964; Fri, 28 Jul 2023 06:58:22 +0000 (UTC) From: Oleksandr Natalenko To: linux-kernel@vger.kernel.org Cc: linux-scsi@vger.kernel.org, Saurav Kashyap , Johannes Thumshirn , GR-QLogic-Storage-Upstream@marvell.com, "James E.J. Bottomley" , "Martin K. Petersen" , Jozef Bacik , Laurence Oberman , Rob Evers Subject: [PATCH 3/3] scsi: qedf: do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly Date: Fri, 28 Jul 2023 08:58:19 +0200 Message-ID: <20230728065819.139694-4-oleksandr@redhat.com> In-Reply-To: <20230728065819.139694-1-oleksandr@redhat.com> References: <20230728065819.139694-1-oleksandr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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=ham 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. 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 Cc: Rob Evers Cc: Johannes Thumshirn Cc: Jozef Bacik Cc: Laurence Oberman Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: GR-QLogic-Storage-Upstream@marvell.com Cc: linux-scsi@vger.kernel.org Tested-by: Laurence Oberman 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