Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp916398rwb; Fri, 28 Jul 2023 01:36:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlG21pkvB/jBucWHACXQUrno0kcfhpTVKzTtMR63pSIjrwPnTpB9rdNe8xbqIZTEF5uJS6aj X-Received: by 2002:a17:90a:a614:b0:267:fe88:f2f3 with SMTP id c20-20020a17090aa61400b00267fe88f2f3mr1567003pjq.15.1690533404035; Fri, 28 Jul 2023 01:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690533404; cv=none; d=google.com; s=arc-20160816; b=p3FWYyMikHsM2kSitwvsDn+T9ond8rDkoz8KAoqjlwcOoUN5OsGlUjZjY1H54K09J3 ucCXF62+LM2oWDFAZedM4McRwjsCxF+5Mgq0z+mQpiXJi3UU2hPvJerpRsfxE6jrfmBl exByhrf7xBOaNkMkwkMpKzlUMO19VG84A45z/rCxagOEA52FmFedkttiYnBdrObzBmVT lvoC4n+Z5k8frMf8R7IMgveU9XN1d0AR+okQLF8nuEuQDEpg/DRrsKkEliKRGsgT3A+6 bFhiRTQAfyjiJmIG9hYV571OVI28J8cvQpCom9KOFg8VIZaApz3qn47NHGxfr+acVjJp 9K0Q== 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=mmcFpYRdWBxfuVgjThhmNKGNVqeFsdrzbtdmI8Kv2Ng=; fh=dAv1Ib71aGpKrsjFCnb/v7cCBPWI3V3Mal2wSsxq0c0=; b=pvtPS0by+t2TOF5RuZOwyJSYM+K7g2owUn6mMmkiaWxEPigCE/wQV9F59Z6WMIU2gr IOJ0R/X3m4nAwaS34wYi80hTkQmr7vqbhpyuWEQIYSjyN1422sD7NnWcaKylMMElYwrQ 7na708OHfXCwvr6y1FE5yytZX7g+eNOBjQxrUA5pTB3QS92CpP0lpW2FMFeTQr7uVDC9 NjmyF3T0nPJSfXKDq/ff04VWk7ThGwvCTN61uwdYlEal6XBixWsNTheHs0g0PjOYYTGD 7W7AxHc2GAgwt71tTY3yTVmlowOS3MyLs3aIg9HCnKuIsFcLRWPX90ZKZxk9EPZAa/rN C78A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=IZebKkHZ; 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 g8-20020a17090a640800b0025e81e3e0c1si1883201pjj.187.2023.07.28.01.36.31; Fri, 28 Jul 2023 01:36:44 -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=IZebKkHZ; 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 S233639AbjG1G7Q (ORCPT + 99 others); Fri, 28 Jul 2023 02:59:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233339AbjG1G7K (ORCPT ); Fri, 28 Jul 2023 02:59:10 -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 2D5D41BC1 for ; Thu, 27 Jul 2023 23:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690527505; 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=mmcFpYRdWBxfuVgjThhmNKGNVqeFsdrzbtdmI8Kv2Ng=; b=IZebKkHZp3ZwnNxhEbyZ0ovY5HyE2HjZWyH7LXH2L1Hrdyp7V5Sc7WC86ZxULjk2jZWiJ/ rlGJEtIDOlEUVGJJuJ7fKOXtWFbLPlxRPTEpLYie3jVVvVa2GfCj3H8lhHACw0g9auADqE 1Tbsjj1y0E77dQCajZDCFxFJxB3pmaU= 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-383-L_OHHr74OO2PcBNgd8HHvg-1; Fri, 28 Jul 2023 02:58:21 -0400 X-MC-Unique: L_OHHr74OO2PcBNgd8HHvg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 24C5F80027F; Fri, 28 Jul 2023 06:58:21 +0000 (UTC) Received: from localhost (unknown [10.45.224.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id D31142166B25; Fri, 28 Jul 2023 06:58:20 +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 1/3] scsi: qedf: do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly Date: Fri, 28 Jul 2023 08:58:17 +0200 Message-ID: <20230728065819.139694-2-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.6 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_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. 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_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 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 = (struct qedf_dbg_ctx *)filp->private_data; struct qedf_ctx *qedf = container_of(qedf_dbg, struct qedf_ctx, dbg_ctx); QEDF_INFO(qedf_dbg, QEDF_LOG_DEBUGFS, "entered\n"); - cnt = sprintf(buffer, "%s\n", + cnt = sprintf(cbuf, "%s\n", qedf->stop_io_on_error ? "true" : "false"); - 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