From nobody Sun Feb 8 14:56:14 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D77B2C83F17 for ; Mon, 28 Aug 2023 22:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233804AbjH1W0T (ORCPT ); Mon, 28 Aug 2023 18:26:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231825AbjH1WZ4 (ORCPT ); Mon, 28 Aug 2023 18:25:56 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F387113D for ; Mon, 28 Aug 2023 15:25:53 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d7814efcccbso4588919276.0 for ; Mon, 28 Aug 2023 15:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693261553; x=1693866353; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=F4UULv7dEfmxkqrWSwHKGjuNFOLz/KrJvgWNb6lbuCs=; b=2kejcxIi3hXJKdZ1GkMysAMauwtVpiO3wB0YJXxm7YLfO/aBFv5JnmffdBZJEtO1n4 vYy3Nj/ny3dFOO26EZvSSF7ssb/5RCa1/gNfHjWztYGwYMST20i5OgA4xd0Q9ZSLTEZe 8E05Pcd2zETrYDm76HD4gD/UW+wi0++6YhbZkcC/WK9cY5tbs1gwSyk6qlJ/v+jXbGGu 23sfZf9CyO1lVUYs5JUujdvX0fLdYXcDqwDu0VPZFbs0UiAaPzba4FXw59jipxriO6bp aurqy2AcFS9uSKPfYLzJs0CXRpTAiBQWRDczqiBKps2GMFGa6eVLlGmKJN4I+0pV2Ywu HErw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693261553; x=1693866353; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=F4UULv7dEfmxkqrWSwHKGjuNFOLz/KrJvgWNb6lbuCs=; b=CYmPCtdN9Pponi0wvSCetlmvMM3kld2dUR5ZG1XAUGj5yhMl1i8iJ7YETPm9nQKzgQ epTxG5PYAAi5naEQ5HyvSXIGY9286xO0elH04O2oAEB22Tokc82FBFYfxEl6+Z50D3EA 4zBo33aBlbkkZlRlCNfNiOU053lVETupXaWIjT/CjyXQDiJeCAZbKOKmWSuIf6ru8RUL DS8y4q2FZAQ98Bp5buKabK+MkrUoZo9fQt36sKsid7/FY0546PP4w4ahZPAM33WoQmuf zyxCHJ10XLWXzA/3KfbdGnkvuzjSbMpAMF6BiCDTHeiB64VxC5TshkhbvclYjYRT8Ro1 oc+Q== X-Gm-Message-State: AOJu0Yz9IrR5UpHlb8MVru4Ika7lM4hfXHWoHwVNy7MLZQUkBCYJZkAF IyRCvVIyTv4TEEP8ZMq4p/kNu7DHLCic/soUEGY= X-Google-Smtp-Source: AGHT+IHebjexSi29sxNXIEYT2we/AIAJmtzB8YnCDOBzFlC85j7fdHzaoXP6O7kQ+CL4Fb+jcj+UYQmnlgWna+E5nYI= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:15c:2d1:203:b64:7817:9989:9eba]) (user=ndesaulniers job=sendgmr) by 2002:a25:ce44:0:b0:d72:8661:ee25 with SMTP id x65-20020a25ce44000000b00d728661ee25mr835131ybe.2.1693261553140; Mon, 28 Aug 2023 15:25:53 -0700 (PDT) Date: Mon, 28 Aug 2023 15:25:47 -0700 In-Reply-To: <20230828-scsi_fortify-v1-0-8dde624a3b2c@google.com> Mime-Version: 1.0 References: <20230828-scsi_fortify-v1-0-8dde624a3b2c@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=eMOZeIQ4DYNKvsNmDNzVbQZqpdex34Aww3b8Ah957X4= X-Developer-Signature: v=1; a=ed25519-sha256; t=1693261549; l=2310; i=ndesaulniers@google.com; s=20230823; h=from:subject:message-id; bh=Ftz8IPZZMe52YKzLHVvnEUhXYdkgyGJWBaj7UgdHpqk=; b=iH/FxqmBBcMZZaaHpoka8f2O5LUsN1gUPcfI94im4BVVB2bk2tNsg449r71D9h0uE967DIv+l StL9iHKe4jeDQkraBppk0fVa0b2INXDjY9hVIKt4WfTZ/GlkIPGiKOW X-Mailer: b4 0.12.3 Message-ID: <20230828-scsi_fortify-v1-1-8dde624a3b2c@google.com> Subject: [PATCH 1/2] scsi: myrb: fix -Wfortify-source From: Nick Desaulniers To: Hannes Reinecke , "James E.J. Bottomley" , "Martin K. Petersen" , Nathan Chancellor Cc: Tom Rix , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nick Desaulniers Content-Type: text/plain; charset="utf-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable clang-18 has improved its support for detecting operations that will truncate values at runtime via -Wfortify-source. Fixes the warning: drivers/scsi/myrb.c:1906:10: warning: 'snprintf' will always be truncated; specified size is 32, but format string expands to at least 34 [-Wfortify-source] In particular, the string literal "physical device - not rebuilding\n" is indeed 34B by my count. When we have a string literal that does not contain any format flags, rather than use snprintf (sometimes with a size that's too small), let's use sprintf. This is pattern is cleaned up throughout the file. Reported-by: Nathan Chancellor Closes: https://github.com/ClangBuiltLinux/linux/issues/1923 Signed-off-by: Nick Desaulniers --- drivers/scsi/myrb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c index ca2e932dd9b7..c2bdff36a6f1 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; =20 if (!sdev->hostdata) - return snprintf(buf, 16, "Unknown\n"); + return sprintf(buf, "Unknown\n"); =20 if (sdev->channel =3D=3D myrb_logical_channel(sdev->host)) { struct myrb_ldev_info *ldev_info =3D sdev->hostdata; @@ -1890,7 +1890,7 @@ static ssize_t raid_level_show(struct device *dev, ldev_info->state); return snprintf(buf, 32, "%s\n", name); } - return snprintf(buf, 32, "Physical Drive\n"); + return sprintf(buf, "Physical Drive\n"); } static DEVICE_ATTR_RO(raid_level); =20 @@ -1903,13 +1903,13 @@ static ssize_t rebuild_show(struct device *dev, unsigned char status; =20 if (sdev->channel < myrb_logical_channel(sdev->host)) - return snprintf(buf, 32, "physical device - not rebuilding\n"); + return sprintf(buf, "physical device - not rebuilding\n"); =20 status =3D myrb_get_rbld_progress(cb, &rbld_buf); =20 if (rbld_buf.ldev_num !=3D sdev->id || status !=3D MYRB_STATUS_SUCCESS) - return snprintf(buf, 32, "not rebuilding\n"); + return sprintf(buf, "not rebuilding\n"); =20 return snprintf(buf, 32, "rebuilding block %u of %u\n", rbld_buf.ldev_size - rbld_buf.blocks_left, --=20 2.42.0.rc2.253.gd59a3bf2b4-goog From nobody Sun Feb 8 14:56:14 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E1F4C83F19 for ; Mon, 28 Aug 2023 22:26:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233844AbjH1W0U (ORCPT ); Mon, 28 Aug 2023 18:26:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232225AbjH1WZ6 (ORCPT ); Mon, 28 Aug 2023 18:25:58 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBCF8139 for ; Mon, 28 Aug 2023 15:25:55 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-59501b014f4so28003657b3.0 for ; Mon, 28 Aug 2023 15:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1693261555; x=1693866355; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=WL1tQymiA0QNtSV27nV5+wlwcB60k6N2NSD+c5q8HQg=; b=JoHOoN5AHuQ86eXhnjG3U070yK9cvNyS2AVvroFNhguy50VpeQ6WU9xS9/gk+nVAW8 cB8tMKGkgUUYQ7fBsfIXzzgEUTzDq1UXuakUOvqqjLSyjTSUfSlvxTT2LARSAcZCsL+6 qb2mda588RKdSlMncA/n0D8yWn/Pb/YH/EzPY/9s+I2xe65rmxP+Zibu7Uj+CeUAwaFK LnYAkfhxfXxdUg66d9HTkdIepibDIgth6uCGBkmKPmIdVHDcWJKPY2US7FNfuaioy3Z6 Z0kBxnEJ61tDFKgoC79rSf2QJwuSxRyoBJCn1REEKlemHGgSt2TQ/310romCB3WlO2oN tO9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693261555; x=1693866355; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WL1tQymiA0QNtSV27nV5+wlwcB60k6N2NSD+c5q8HQg=; b=eUoZTZHz0mQ5ogYgF6eAmahLJ/Taej0q71TUTirJvXjaWhzk3EwZDSCtD0kKaYk2Ga D9/Lfg1JaQtyGz41Gl6CdYJH4zm2ThUKTWjHDcGolIY49roMmkvLd4DkVlgk5ccZyH7Y V87L99eAundG56bOJpJQMH5hr7UYH4piNOp2c8BpzRZbI0jQrTlfPSsfZd3kt6kay/+N V2e3Lu8uGds83NqFGF5SouUw/MfGttWW9aSc+FV9AfmTis/yqvJzUNntyXAJdvwwi4mz 942eEBchIlCEvLu/v5o8UACF7e4SCe/7MsqZZdbtPqr64YObmUXOwbUx0JOMVfoa2vz0 3xXg== X-Gm-Message-State: AOJu0Yz+NjLaF7tvnqnLaOvsapah1lsCi478DP+j2r2hqkjAhNAOzyuI HHQqvBQfvoSOGN/j5OFFTnSu8q4aYcRLdhVI8KE= X-Google-Smtp-Source: AGHT+IEHx1L4auj/EdI7SADc9H3MwvX/vPnn5w8vp1/S1Yz4HvTE6wVG99CwlClV81ou70LXLC9pxdtTeMr8Ap710PU= X-Received: from ndesaulniers-desktop.svl.corp.google.com ([2620:15c:2d1:203:b64:7817:9989:9eba]) (user=ndesaulniers job=sendgmr) by 2002:a81:ae06:0:b0:573:87b9:7ee9 with SMTP id m6-20020a81ae06000000b0057387b97ee9mr829678ywh.4.1693261555125; Mon, 28 Aug 2023 15:25:55 -0700 (PDT) Date: Mon, 28 Aug 2023 15:25:48 -0700 In-Reply-To: <20230828-scsi_fortify-v1-0-8dde624a3b2c@google.com> Mime-Version: 1.0 References: <20230828-scsi_fortify-v1-0-8dde624a3b2c@google.com> X-Developer-Key: i=ndesaulniers@google.com; a=ed25519; pk=eMOZeIQ4DYNKvsNmDNzVbQZqpdex34Aww3b8Ah957X4= X-Developer-Signature: v=1; a=ed25519-sha256; t=1693261549; l=3338; i=ndesaulniers@google.com; s=20230823; h=from:subject:message-id; bh=QVZghMLPP42usKlaJQTZjiZHzXDWVKPfY+QwZHJyIKk=; b=PtTKGhzagQppTiG/eusxtBe/ncoCdao9ylHQtdEesrL9MNPm094c3VNQzvmSFiFi+bCIdx0j0 /87XN3v+sIwCZ8O5qbGc7RbENymwoeWEuxMauBVAgPfdGfwDIBsvuap X-Mailer: b4 0.12.3 Message-ID: <20230828-scsi_fortify-v1-2-8dde624a3b2c@google.com> Subject: [PATCH 2/2] scsi: myrs: fix -Wfortify-source From: Nick Desaulniers To: Hannes Reinecke , "James E.J. Bottomley" , "Martin K. Petersen" , Nathan Chancellor Cc: Tom Rix , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Nick Desaulniers Content-Type: text/plain; charset="utf-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable clang-18 has improved its support for detecting operations that will truncate values at runtime via -Wfortify-source. Fixes the warning: drivers/scsi/myrs.c:1089:10: warning: 'snprintf' will always be truncated; specified size is 32, but format string expands to at least 34 [-Wfortify-source] In particular, the string literal "physical device - not rebuilding\n" is indeed 34B by my count. When we have a string literal that does not contain any format flags, rather than use snprintf (sometimes with a size that's too small), let's use sprintf. This is pattern is cleaned up throughout the file. Reported-by: Nathan Chancellor Closes: https://github.com/ClangBuiltLinux/linux/issues/1923 Signed-off-by: Nick Desaulniers --- drivers/scsi/myrs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c index a1eec65a9713..729f08379bd0 100644 --- a/drivers/scsi/myrs.c +++ b/drivers/scsi/myrs.c @@ -939,7 +939,7 @@ static ssize_t raid_state_show(struct device *dev, int ret; =20 if (!sdev->hostdata) - return snprintf(buf, 16, "Unknown\n"); + return sprintf(buf, "Unknown\n"); =20 if (sdev->channel >=3D cs->ctlr_info->physchan_present) { struct myrs_ldev_info *ldev_info =3D sdev->hostdata; @@ -1058,7 +1058,7 @@ static ssize_t raid_level_show(struct device *dev, const char *name =3D NULL; =20 if (!sdev->hostdata) - return snprintf(buf, 16, "Unknown\n"); + return sprintf(buf, "Unknown\n"); =20 if (sdev->channel >=3D cs->ctlr_info->physchan_present) { struct myrs_ldev_info *ldev_info; @@ -1086,7 +1086,7 @@ static ssize_t rebuild_show(struct device *dev, unsigned char status; =20 if (sdev->channel < cs->ctlr_info->physchan_present) - return snprintf(buf, 32, "physical device - not rebuilding\n"); + return sprintf(buf, "physical device - not rebuilding\n"); =20 ldev_info =3D sdev->hostdata; ldev_num =3D ldev_info->ldev_num; @@ -1102,7 +1102,7 @@ static ssize_t rebuild_show(struct device *dev, (size_t)ldev_info->rbld_lba, (size_t)ldev_info->cfg_devsize); } else - return snprintf(buf, 32, "not rebuilding\n"); + return sprintf(buf, "not rebuilding\n"); } =20 static ssize_t rebuild_store(struct device *dev, @@ -1190,7 +1190,7 @@ static ssize_t consistency_check_show(struct device *= dev, unsigned short ldev_num; =20 if (sdev->channel < cs->ctlr_info->physchan_present) - return snprintf(buf, 32, "physical device - not checking\n"); + return sprintf(buf, "physical device - not checking\n"); =20 ldev_info =3D sdev->hostdata; if (!ldev_info) @@ -1202,7 +1202,7 @@ static ssize_t consistency_check_show(struct device *= dev, (size_t)ldev_info->cc_lba, (size_t)ldev_info->cfg_devsize); else - return snprintf(buf, 32, "not checking\n"); + return sprintf(buf, "not checking\n"); } =20 static ssize_t consistency_check_store(struct device *dev, @@ -1376,7 +1376,7 @@ static ssize_t processor_show(struct device *dev, info->cpu[1].cpu_name, second_processor, info->cpu[1].cpu_count); else - ret =3D snprintf(buf, 64, "1: absent\n2: absent\n"); + ret =3D sprintf(buf, "1: absent\n2: absent\n"); =20 return ret; } --=20 2.42.0.rc2.253.gd59a3bf2b4-goog