Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp1445468rda; Mon, 23 Oct 2023 12:51:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOgaYhCXLBlUKtJ5o/5chhQp8gKcqDLcpv+tnkW9zQgpUPa7/nWzz9F3EMRHVz+pwQIUGV X-Received: by 2002:a05:6358:2591:b0:168:eb13:807d with SMTP id h17-20020a056358259100b00168eb13807dmr1526374rwc.14.1698090675452; Mon, 23 Oct 2023 12:51:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698090675; cv=none; d=google.com; s=arc-20160816; b=MRY4+hD9I1TTMb18V8R+v0124HNbtu8vuUY+/iEI4GTEMIeOPKjxRNv0G4xthGSo2s T4z+Zb7mLvRi/vzm7xS6kcAbH+9bZCqOG6AQMVy71GlY1Fx1pvGW5eH2TEWb5WPKfSsJ 7ZqW5gdOABuZzDdA6iSwIue/n/L9o5+95wLFodyAhiazJ9zdlu2+mMj+7qcnIM5lMx6+ 8Q8OxLORD8IYNj+UmWy/LQyelXyBv/693y1TouLg1OIgpfZGvYuUH/DJtdQZ0hNxTHIj 4PQ0GZ/jTYZFi8M7z5jKCX0e2e7y9gHVdk0eSKtcB9Sz/s2AV+ntYduN6vA0uu9GLYTb LxAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=bF7T0d28n9cL6YgeW2rqKNnAbndsOrdsoITtJXsJhco=; fh=XSRcR/Yi2gZ/5rnwodhA6q+U+HosDMV8K7ZGDU5daRI=; b=aL/AKFysr7steCsVD1v3iJn01xcjofS5j34K/57Bc05gtEgK8F9Y4h9qyEX8cd2dL6 ScVQF8EshgGinG4scB6ET/9FVhFb1kWeigrDhJ8I0+jKXC4c81YzyHbYbjjcqMMSDhbC szoNq9QU2OcaLUqgQcdqdtQWF/J+srpO2Ohov8c2R4eDcCSG38lTNL4bdw5DmMkTyepN 9xF320IcqcNpcW5sw8Qa4wPvzzonfuubf4h3CO/3f4o7EWi/ylvN1bKIFA/05IqPpGke acy53tugYR54jEV0XhKpYSSg+e0PhGo0a6fDQwHl1Iv30a+aXmhojupcxsh6fPQEBpL0 RogA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=VV3XnTVn; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id o37-20020a634e65000000b00573f786103dsi6945049pgl.754.2023.10.23.12.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 12:51:15 -0700 (PDT) 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=@google.com header.s=20230601 header.b=VV3XnTVn; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id D89EA8089877; Mon, 23 Oct 2023 12:51:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229628AbjJWTvD (ORCPT + 99 others); Mon, 23 Oct 2023 15:51:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbjJWTvB (ORCPT ); Mon, 23 Oct 2023 15:51:01 -0400 Received: from mail-ot1-x349.google.com (mail-ot1-x349.google.com [IPv6:2607:f8b0:4864:20::349]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 308FD1A4 for ; Mon, 23 Oct 2023 12:50:59 -0700 (PDT) Received: by mail-ot1-x349.google.com with SMTP id 46e09a7af769-6c70e93400bso6210181a34.0 for ; Mon, 23 Oct 2023 12:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698090658; x=1698695458; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=bF7T0d28n9cL6YgeW2rqKNnAbndsOrdsoITtJXsJhco=; b=VV3XnTVniOZXoCAAMyXAJgZvS8v42+VNeI5Jy5p7T5SzwXqUdBY8rQY3MaH/S4Uk/G ekNsTdpE7mdmR+9VU2l++lBxbAPF/u6wwxxHv3jvijT6Kh/a1y4QCOAM5SFaqzi6SGGU pDrgPmSWzFxbnPSRqt460d5QHzXrXDSAsGXIpYkEL4+d662ygpOuEB6hW6oShoNzU2zs Rw/15fWa0uewaEnEX2WL15o+vhJMce8CEZ85emXq14bIOs/X0owBoVnHj5/kGAEzMFa7 pmtyNQbyR59uld+6jpJNtti+V2pTlWT9URS7rYyAjgcmI3myuq+YH4Mk81nYYqrdJzY/ WrEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698090658; x=1698695458; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bF7T0d28n9cL6YgeW2rqKNnAbndsOrdsoITtJXsJhco=; b=muHw/bSboiSCGWkLkdrKG/orXbGYatdbyu6G7uimPPPfO2prTMVPwihiLNm7aNo64l gb34u1KaKKgw56QOen03vIyw/Rfh5pd/n6lKfTczYoblrwvDqQnOG0/T27LPhiycCiO5 Z+y2EAvli994LglMeaZg9tIHVORIaOvBuHCw1lI30zEDv7MWeLuUeTZcMB24BjbzHdF0 sPhtCFoLWkQ26YFnJi8iEBuefQetCybb9HNdRW17OUJKUb7pVu2I4FaLBvjclzYMFHl0 IPSmLbYdY64QcLSkJCBMxwee6E46Bn+I6twZCsEKk8q2JlHZtuD96OYnBRvt4Jt/AlYJ HVjQ== X-Gm-Message-State: AOJu0YyuqQaP3GACk1YA34LS2wNr2nQ1X1QwQHLTw4f5WtHQBKIHA3CO dzMpsPbjf5zHjn1XU//Zrp6jq1XeJ5+yjC14VA== X-Received: from jstitt-linux1.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:23b5]) (user=justinstitt job=sendgmr) by 2002:a05:6830:9:b0:6bc:f328:696a with SMTP id c9-20020a056830000900b006bcf328696amr2714868otp.0.1698090658533; Mon, 23 Oct 2023 12:50:58 -0700 (PDT) Date: Mon, 23 Oct 2023 19:50:57 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAKDONmUC/x3MMQqDQBBG4avI1BlQV5B4FbHQ2TGZZiPzi1Fk7 54lxSu+5t0EdVPQUN3kehjskwqaR0XyntNL2WIxtXUbmhJj9yTbxdHtUAdDYBy+jBksLL1IHfr YLfKk8thcVzv//3HK+QePuh6hbwAAAA== X-Developer-Key: i=justinstitt@google.com; a=ed25519; pk=tC3hNkJQTpNX/gLKxTNQKDmiQl6QjBNCGKJINqAdJsE= X-Developer-Signature: v=1; a=ed25519-sha256; t=1698090657; l=2555; i=justinstitt@google.com; s=20230717; h=from:subject:message-id; bh=7GBzrHxBfUi4U3AvyTYICsD2FUILDgUdjKwKv0QmnCY=; b=XgVC/DXR0DzmOmUA/pGXj7Oim73+vtl9EM47VYRbVwNnvy3QrTsTEi4sHRs+WdbEqHS0hunvB atsZa3YYQWACsuUDJze3QJQSkCf0yxVXO1e09sFqUyHmC9pCx30v7rk X-Mailer: b4 0.12.3 Message-ID: <20231023-strncpy-drivers-scsi-3w-sas-c-v1-1-4c40a1e99dfc@google.com> Subject: [PATCH] scsi: 3w-sas: replace deprecated strncpy with strscpy From: Justin Stitt To: Adam Radford , "James E.J. Bottomley" , "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Justin Stitt Content-Type: text/plain; charset="utf-8" X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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]); Mon, 23 Oct 2023 12:51:12 -0700 (PDT) strncpy() is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. This pattern of strncpy(dest, src, strlen(src)) is extremely bug-prone. This pattern basically never results in NUL-terminated destination strings unless `dest` was zero-initialized. The current implementation may be accidentally correct as tw_dev is zero-allocated via: host = scsi_host_alloc(&driver_template, sizeof(TW_Device_Extension)); ... tw_dev = shost_priv(host); ... wherein scsi_host_alloc zero-allocates host: shost = kzalloc(sizeof(struct Scsi_Host) + privsize, GFP_KERNEL); Also, further suggesting this change is worthwhile is another strscpy() usage in 32-9xxx.c: strscpy(tw_dev->tw_compat_info.driver_version, TW_DRIVER_VERSION, sizeof(tw_dev->tw_compat_info.driver_version)); Considering the above, a suitable replacement is `strscpy` [2] due to the fact that it guarantees NUL-termination on the destination buffer without unnecessarily NUL-padding. Let's not be accidentally correct, let's be definitely correct. Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2] Link: https://github.com/KSPP/linux/issues/90 Cc: linux-hardening@vger.kernel.org Signed-off-by: Justin Stitt --- Note: build-tested only. Found with: $ rg "strncpy\(" --- drivers/scsi/3w-sas.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index 55989eaa2d9f..9bdb75dfdcd7 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -1326,7 +1326,8 @@ static int twl_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset) } /* Load rest of compatibility struct */ - strncpy(tw_dev->tw_compat_info.driver_version, TW_DRIVER_VERSION, strlen(TW_DRIVER_VERSION)); + strscpy(tw_dev->tw_compat_info.driver_version, TW_DRIVER_VERSION, + sizeof(tw_dev->tw_compat_info.driver_version)); tw_dev->tw_compat_info.driver_srl_high = TW_CURRENT_DRIVER_SRL; tw_dev->tw_compat_info.driver_branch_high = TW_CURRENT_DRIVER_BRANCH; tw_dev->tw_compat_info.driver_build_high = TW_CURRENT_DRIVER_BUILD; --- base-commit: 9c5d00cb7b6bbc5a7965d9ab7d223b5402d1f02c change-id: 20231023-strncpy-drivers-scsi-3w-sas-c-c7cc037d4bc9 Best regards, -- Justin Stitt