From patchwork Tue Dec 12 20:09:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 177549 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7974625vqy; Tue, 12 Dec 2023 12:09:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMAflfFZKz2yq8pwO2KziDDIMAZjqbYdlxXHAVKQLC3wbGdSbTN+S0KJqf6Uvu8FQXBnDC X-Received: by 2002:a05:6a00:a85:b0:6ce:2731:c23e with SMTP id b5-20020a056a000a8500b006ce2731c23emr4076604pfl.45.1702411789816; Tue, 12 Dec 2023 12:09:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702411789; cv=none; d=google.com; s=arc-20160816; b=qlQn/Pfk7Oxd2aOcOHAyCLLsXiGaZBxDywOIcePEd22yV/pP3sg1gNiRjzquLDZDtu KOJ8J4uXYMKFB1aampGmuXPPxbqN/RthiL7SFKXDfYd0SlnNWf0JM3NIURtNS3M9I+o7 khZ3TQxReoBDyuoEX8qpd3GdZTeYP51eAzHKym8RNW2Jf3I4o79fQkl/BU0q8diFisaV 6Vjqp5yKJ0LHWOhHIDFSBFnhZ6bZo37W4XuMmKOT/+d5atOmUUp7XMjlXegMq2VU/8RP DIxNPLPHuNSXYEQYXzuGQXXslkFjfIn6LMz8sM5G8W9uptjjzdRXVJwwqa+fEptsybLZ TvtA== 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=rzREpo573xITBwLatd+AesvCg1dKu2ILxitSwm0Do8U=; fh=3cWKadWkaflzpYpCkqerRKepPQAR2AjILT0uXFmappk=; b=LFIdH/mBIslRfF/VgKMvTf9G4BBwSAHbbmQI1e2yNDpFXDjJCFHnZ+DF0L02e+ehH8 BajcPDFYfVSzQUTRil8MYua+hVM3o7MR6v7MxQyb3IYEBCKFBq6UIk5OmaItU2r9KXic f/EhjVWDcLe9guJgBeKZr/QFfg9Tpt3J9IALjZbk/kg4v5YDLEoTp9zT7pxVpchqj35v CwPmx1A92xryyqxUtuaNDd3BbhYuOsrFxegDGgfyUnJ0Qy4u9wkWQUUdJ2ln7aYHo6I1 +TczbwNgJQFKyxA6RN3NN3t2Lsot99tMcFf/8DUK10jQZ+cxzpiaszSi+fGzcph2wk+N YLJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=RGxW9X+6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id m32-20020a635820000000b005bdbeb537bcsi8154630pgb.37.2023.12.12.12.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 12:09:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=RGxW9X+6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 7A219802374B; Tue, 12 Dec 2023 12:09:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377182AbjLLUJh (ORCPT + 99 others); Tue, 12 Dec 2023 15:09:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377223AbjLLUJb (ORCPT ); Tue, 12 Dec 2023 15:09:31 -0500 Received: from smtp.smtpout.orange.fr (smtp-15.smtpout.orange.fr [80.12.242.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AAC7106 for ; Tue, 12 Dec 2023 12:09:37 -0800 (PST) Received: from pop-os.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id D94JrCWy533VXD94SrOSjJ; Tue, 12 Dec 2023 21:09:37 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1702411777; bh=rzREpo573xITBwLatd+AesvCg1dKu2ILxitSwm0Do8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RGxW9X+6QDlJlLBQUcA0lWPDbyVrN+Ae0d6pwDAbQdujnkefi4YWvtQbTzqxFptlB FKOmfm705tYk4vrD31LDkEgjlMBPgwlE6UTx7d8+vgYO1dEw/eq7bDtk1i0rJSJN+B 8+LRn+HcTE2JeRN3Q2AMeZJOzLejifNqiBHw/MWY+Ue0EN0An9XxI1IUca3HK0Vu/O hTj7Oh+4SAeo2VeUragI2IzNfRbc82l8/yTrEzzM8MtUJ8RyXxapru+nZ+PvWtlxAN n0OZzi5Jn4CbcBdpMh4yjQXIvw223y4YIJ3jGi+IkO4ZwWgJz8Qu3m0cy7XAc8DRsz KFi9s/7B3Kvbg== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Tue, 12 Dec 2023 21:09:37 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: hare@kernel.org, jejb@linux.ibm.com, martin.petersen@oracle.com Cc: hare@suse.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH 1/2] scsi: myrb: Fix a potential string truncation in rebuild_show() Date: Tue, 12 Dec 2023 21:09:10 +0100 Message-Id: <2d3096dd4b1b6e758287e4062e3147c57c007eaa.1702411083.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 12 Dec 2023 12:09:46 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785108144400133903 X-GMAIL-MSGID: 1785108144400133903 "physical device - not rebuilding\n" is 34 bytes long. When written in 'buf' with a limit of 32 bytes, it is truncated. When building with W=1, it leads to: drivers/scsi/myrb.c: In function ‘rebuild_show’: drivers/scsi/myrb.c:1906:24: error: ‘physical device - not rebuil...’ directive output truncated writing 33 bytes into a region of size 32 [-Werror=format-truncation=] 1906 | return snprintf(buf, 32, "physical device - not rebuilding\n"); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/scsi/myrb.c:1906:24: note: ‘snprintf’ output 34 bytes into a destination of size 32 Change the allowed size to 64 to fix the issue. Fixes: 081ff398c56c ("scsi: myrb: Add Mylex RAID controller (block interface)") Signed-off-by: Christophe JAILLET --- drivers/scsi/myrb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c index ca2e932dd9b7..ca2380d2d6d3 100644 --- a/drivers/scsi/myrb.c +++ b/drivers/scsi/myrb.c @@ -1903,15 +1903,15 @@ static ssize_t rebuild_show(struct device *dev, unsigned char status; if (sdev->channel < myrb_logical_channel(sdev->host)) - return snprintf(buf, 32, "physical device - not rebuilding\n"); + return snprintf(buf, 64, "physical device - not rebuilding\n"); status = myrb_get_rbld_progress(cb, &rbld_buf); if (rbld_buf.ldev_num != sdev->id || status != MYRB_STATUS_SUCCESS) - return snprintf(buf, 32, "not rebuilding\n"); + return snprintf(buf, 64, "not rebuilding\n"); - return snprintf(buf, 32, "rebuilding block %u of %u\n", + return snprintf(buf, 64, "rebuilding block %u of %u\n", rbld_buf.ldev_size - rbld_buf.blocks_left, rbld_buf.ldev_size); } From patchwork Tue Dec 12 20:09:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 177551 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7974717vqy; Tue, 12 Dec 2023 12:09:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IHJnqRomOzmvAP/ndouWdCJqHyIEs8IKVn7aa88z/ZOOevePw1dbSjFcfb0vl1ofgZSE2h/ X-Received: by 2002:a17:902:ec85:b0:1d0:6ffd:ae0e with SMTP id x5-20020a170902ec8500b001d06ffdae0emr4078614plg.117.1702411799064; Tue, 12 Dec 2023 12:09:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702411799; cv=none; d=google.com; s=arc-20160816; b=q/MA2bB5EO1YnS1Cjnjs4GB9FN5FEOYBKf0wpug9cOAWjZ0XxoDDZxl8Iq/hVb5Yxu Z/b7tixSHiAcxmyP7Do0eJKcPyugUgAC95pwPzV/885D4fchqJ2YY4ia1q8fBfqDL+A2 y+jezKD5XasVbL5DSp3VjBDBVmEBnTH5lUH5LH1qg1x54E2EHCL55ZSVxJfnhkzCaeit kpvzXRQ/OCCHsUavyf1d0+0Oq7PNhmOsjbxnPmXwWYjylKlHc7bs1Lm/XSHuQSgKZw4B S4fmtoqw3U3FV+zbg4Pa7jt8PQxGExpXpp3KFaAd5CZplplaoy4+53RdlSDbLDcwkXfl V9kQ== 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=aQv1R2UteayjqvKDNKiDv03fz9TZ0ZNa1LFJYmxEkvQ=; fh=3cWKadWkaflzpYpCkqerRKepPQAR2AjILT0uXFmappk=; b=fYMJ7V/GeofPyX/cQArJh9P9xyUqNmqAimERTU0kgxYRaLuWMr9LHDRe4UDESWqySy gpDcWT5+E0GNaiRPvg447NkGZQ131qF5izIxi3Rqr0AoHZ/uzcOtzyDojH01pyXK4CIy 5H2TaZz6BcW7sDZwV7g0W4mdn/CHs8ZgoMyP4AsJzJ0o3eaqaxwBk0l3emzxBI3NBc5Q 6qRY7d7tc5jHSaiR1TjaLXzHySi61JKZghWOtcRsuW1qN5AM4GUVJTqZ4MRxggICnqNX 65GZMqPpAC+15f+ndYc+/z7PA0oW1NyY7yisgRVPBJia94Rfm3/Y3XvGNfqaK4wfyR2E eebg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=D3EWyeHk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id n9-20020a170903110900b001d09c54485esi8467798plh.568.2023.12.12.12.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 12:09:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=D3EWyeHk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=wanadoo.fr Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 43DF38053C7F; Tue, 12 Dec 2023 12:09:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377250AbjLLUJo (ORCPT + 99 others); Tue, 12 Dec 2023 15:09:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233112AbjLLUJe (ORCPT ); Tue, 12 Dec 2023 15:09:34 -0500 Received: from smtp.smtpout.orange.fr (smtp-15.smtpout.orange.fr [80.12.242.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AC53D2 for ; Tue, 12 Dec 2023 12:09:38 -0800 (PST) Received: from pop-os.home ([92.140.202.140]) by smtp.orange.fr with ESMTPA id D94JrCWy533VXD94UrOSjX; Tue, 12 Dec 2023 21:09:38 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1702411778; bh=aQv1R2UteayjqvKDNKiDv03fz9TZ0ZNa1LFJYmxEkvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D3EWyeHkIvr5Rxwxb54c75yc3CvncyLDgz++8kEZWr//jY9N/UAmbOvFVlLtLSFQR AJMlbZbo8qdAPtZqMd3nwc+CDY5XEOrF6w/btHMHktfCwZbS6U6vIIW5crRiPSZVqM NQQyj1SPnjbVoMQnZEyIRrHWNy+2Ch/d3Eli1lbsdYI4mvFZRJlqhaQnYEN2M+RiRw WvwbbjadlRlILxPXcisn1DXDKvtf2WSCxsAcWljSPps0ya62BGuBQxhhojLAgn6mkx cWsF74oAkGMK7opdhx8GuIX6EVxbj8d515FxHYKDb7tWxFXlXzK0aaSChqii0XPtRC l6tTDRvQHUXcQ== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Tue, 12 Dec 2023 21:09:38 +0100 X-ME-IP: 92.140.202.140 From: Christophe JAILLET To: hare@kernel.org, jejb@linux.ibm.com, martin.petersen@oracle.com Cc: hare@suse.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH 2/2] scsi: myrb: Use sysfs_emit() Date: Tue, 12 Dec 2023 21:09:11 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,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 agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 12 Dec 2023 12:09:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785108154602295190 X-GMAIL-MSGID: 1785108154602295190 In order to avoid hard-coded limits in _show() function, use the preferred sysfs_emit() that knows better about it. Signed-off-by: Christophe JAILLET --- drivers/scsi/myrb.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c index ca2380d2d6d3..06a5e6fb9f99 100644 --- a/drivers/scsi/myrb.c +++ b/drivers/scsi/myrb.c @@ -1767,7 +1767,7 @@ static ssize_t raid_state_show(struct device *dev, int ret; if (!sdev->hostdata) - return snprintf(buf, 16, "Unknown\n"); + return sysfs_emit(buf, "Unknown\n"); if (sdev->channel == myrb_logical_channel(sdev->host)) { struct myrb_ldev_info *ldev_info = sdev->hostdata; @@ -1775,10 +1775,10 @@ static ssize_t raid_state_show(struct device *dev, name = myrb_devstate_name(ldev_info->state); if (name) - ret = snprintf(buf, 32, "%s\n", name); + ret = sysfs_emit(buf, "%s\n", name); else - ret = snprintf(buf, 32, "Invalid (%02X)\n", - ldev_info->state); + ret = sysfs_emit(buf, "Invalid (%02X)\n", + ldev_info->state); } else { struct myrb_pdev_state *pdev_info = sdev->hostdata; unsigned short status; @@ -1796,10 +1796,10 @@ static ssize_t raid_state_show(struct device *dev, else name = myrb_devstate_name(pdev_info->state); if (name) - ret = snprintf(buf, 32, "%s\n", name); + ret = sysfs_emit(buf, "%s\n", name); else - ret = snprintf(buf, 32, "Invalid (%02X)\n", - pdev_info->state); + ret = sysfs_emit(buf, "Invalid (%02X)\n", + pdev_info->state); } return ret; } @@ -1886,11 +1886,11 @@ static ssize_t raid_level_show(struct device *dev, name = myrb_raidlevel_name(ldev_info->raid_level); if (!name) - return snprintf(buf, 32, "Invalid (%02X)\n", - ldev_info->state); - return snprintf(buf, 32, "%s\n", name); + return sysfs_emit(buf, "Invalid (%02X)\n", + ldev_info->state); + return sysfs_emit(buf, "%s\n", name); } - return snprintf(buf, 32, "Physical Drive\n"); + return sysfs_emit(buf, "Physical Drive\n"); } static DEVICE_ATTR_RO(raid_level); @@ -1903,17 +1903,17 @@ static ssize_t rebuild_show(struct device *dev, unsigned char status; if (sdev->channel < myrb_logical_channel(sdev->host)) - return snprintf(buf, 64, "physical device - not rebuilding\n"); + return sysfs_emit(buf, "physical device - not rebuilding\n"); status = myrb_get_rbld_progress(cb, &rbld_buf); if (rbld_buf.ldev_num != sdev->id || status != MYRB_STATUS_SUCCESS) - return snprintf(buf, 64, "not rebuilding\n"); + return sysfs_emit(buf, "not rebuilding\n"); - return snprintf(buf, 64, "rebuilding block %u of %u\n", - rbld_buf.ldev_size - rbld_buf.blocks_left, - rbld_buf.ldev_size); + return sysfs_emit(buf, "rebuilding block %u of %u\n", + rbld_buf.ldev_size - rbld_buf.blocks_left, + rbld_buf.ldev_size); } static ssize_t rebuild_store(struct device *dev, @@ -2140,7 +2140,7 @@ static ssize_t ctlr_num_show(struct device *dev, struct Scsi_Host *shost = class_to_shost(dev); struct myrb_hba *cb = shost_priv(shost); - return snprintf(buf, 20, "%u\n", cb->ctlr_num); + return sysfs_emit(buf, "%u\n", cb->ctlr_num); } static DEVICE_ATTR_RO(ctlr_num); @@ -2150,7 +2150,7 @@ static ssize_t firmware_show(struct device *dev, struct Scsi_Host *shost = class_to_shost(dev); struct myrb_hba *cb = shost_priv(shost); - return snprintf(buf, 16, "%s\n", cb->fw_version); + return sysfs_emit(buf, "%s\n", cb->fw_version); } static DEVICE_ATTR_RO(firmware); @@ -2160,7 +2160,7 @@ static ssize_t model_show(struct device *dev, struct Scsi_Host *shost = class_to_shost(dev); struct myrb_hba *cb = shost_priv(shost); - return snprintf(buf, 16, "%s\n", cb->model_name); + return sysfs_emit(buf, "%s\n", cb->model_name); } static DEVICE_ATTR_RO(model);