Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp3036179rwo; Mon, 24 Jul 2023 05:27:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlH/27IF8jRMhJNo/W0bVlms66/tockrH/bzd7YdfvB7CNbC0ZYQE2cj79Exo81HucIx7XMs X-Received: by 2002:a05:6a00:244f:b0:676:ad06:29d9 with SMTP id d15-20020a056a00244f00b00676ad0629d9mr8040987pfj.17.1690201643338; Mon, 24 Jul 2023 05:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690201643; cv=none; d=google.com; s=arc-20160816; b=Z/6zyMzofncrF5JX4ws1/ZwJMr1O7Flr6R1bHoj5iuK3EYLHXpf/0cBelPFlizEMW4 HpMX7mHu7twSQNyc5ngaom/BF7dSwN+Mpze8FcO/n4Ygdj9Y/5c7pyhMrP6ut14a626n eSbe4Q+AHP7mn1+6s5WzEbTRij7eSnz8yw4QacPqZj4Zsy/BbuDdE9A1fj0XUDUpoV5E e2QACboFiWZEbFGqrBhh9BDSoM/7FJT7dXv4hYWrQ7k5a2sA+62NEQhFhtkmPMfG2c9X a0+MKpKufonRs6dSiJo0F/9Pvuzio5kZt3VFoKJe/Rlk4za3tshvKvXcyoZhWFG4NviK /Xdw== 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=5cbGLzsOpszIW29iDt5MpDYjv/Oe38KhgfInWeAU+S0=; fh=nltHpYi3YoyP0NVhXDe1nu5cQ49IzwbxnGq+K+kbE3c=; b=MAnmJmo7U0UqCar6v4GwkL/cbgBzWuPk3HuslV+HgzVVc4POtMc2HiMQQGi/MzNgj3 DLa4qiWaQYxc1RxjdKEfqd9TXcNli2EA7GmszchmBBMGTKnRI0+sVF9Fsuw2gFM8sEBR 7t9vqTNcVgrztqSgIxfQicXeTrnE+cAe8IeQvirjSBSBo9XK48JnBOA/25HsIeRYcCqL 61B7AMUXHX207LCR/2ytpHS/Ah/O+GL6nhixx9zjmqYWyEEI+kYYLgfzfmuymsEg4Syr Ie2CEs22QnXzVokdZOFax5sttxqEBR4yZe9g6anIfy5Tyxrle3jzjmKr2UqkKGcFE4ZO BV7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CkipfAxS; 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 q10-20020a63980a000000b0055be9526b7fsi9079010pgd.416.2023.07.24.05.27.11; Mon, 24 Jul 2023 05:27:23 -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=CkipfAxS; 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 S229509AbjGXMDr (ORCPT + 99 others); Mon, 24 Jul 2023 08:03:47 -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: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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_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 --- 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 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]; 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); - 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