Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp2235361rda; Tue, 24 Oct 2023 17:31:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFxvo3RBN8Ek5eDo0b2bgIE+QmZMozh10I+ljccvElk7PxYyln3FBrCWCp/Wq0nJcjGAUVB X-Received: by 2002:a17:902:e74a:b0:1c7:5a63:43bb with SMTP id p10-20020a170902e74a00b001c75a6343bbmr12797255plf.8.1698193863130; Tue, 24 Oct 2023 17:31:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698193863; cv=none; d=google.com; s=arc-20160816; b=ROXZVrwc858EfsgVmAx4M73kBSSOT3riG3U4toxC5xqFusIooeejNjt3dI2QHvdYzu OBHBRPMZmbRQ7S7egAu3gmCfK+vEoc1JJwe5wGmOXptWGV8abzUA77R3CfJ6OTQgVtUd A93fi4Nt3+kwcvK0Zuxba1JCgGCBofNSiA0HIFE3l6bHy1C4ExMGFBuzCtFvSMcyNkRp T8wYMjtaMXl7FdT1rdb4s0+XqbPf6CQB+eyIesQ4niaIvck2+4NZUds5nAmLXWDfhbsd bHiltaRVkX31O3GjLjs8nYSlN9PeDHf46H9jF7PzTExLtVnTFxfj/43wVwuyEwiSW/2v ks2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=n87sUffC3jIAj0OzBWNWPGKXdWXX/v+Z+ob+S6qU1cI=; fh=ln0jRD82WCdMSZpCAi2U1aMqs4HAqh4OB1GkI9d/bQ0=; b=swzuAC5qWd3gZ7d6rvVMWz3MxtWiYkfWAfB/4cgJzAqfQNhpkvNfZzb7vkmxX6/cI8 szoBd4DZpxEVEg4b4Xcu2bCFlMISRQPNO8XdGYlRSYJ+M53X816bCHXXMEI05btLLKpE ZGeiStM4qkbHROeX0CjxerliQgQP18MpfamLskDEVSVXwPahtkueK1/3d+M01ZVqp9zx WTjPuCkeYHBt90BaPlGg/OFzO7TeKJTzDUYVqFyHH6FOikQg3j67KqJ4otSXt3iWogxH eavQ8FSTTNn6vpnYCFUmpA9BP7gf/RD3ySPXgKsE8jDCdSoiymrH1L5iigcLx3oE7K6Y Jeaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gudDxT+c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id g2-20020a170902c38200b001b811261289si8684275plg.482.2023.10.24.17.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 17:31:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gudDxT+c; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 2136180941FA; Tue, 24 Oct 2023 17:31:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344764AbjJYAa6 (ORCPT + 99 others); Tue, 24 Oct 2023 20:30:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344751AbjJYAa4 (ORCPT ); Tue, 24 Oct 2023 20:30:56 -0400 Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3838A10CC for ; Tue, 24 Oct 2023 17:30:53 -0700 (PDT) Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-6ce2bcb131fso3362391a34.1 for ; Tue, 24 Oct 2023 17:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698193852; x=1698798652; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=n87sUffC3jIAj0OzBWNWPGKXdWXX/v+Z+ob+S6qU1cI=; b=gudDxT+cXy6mPPgK/JaxC2ja7o1tqiFTSOrZ0XCCODP+5xdE+GmsWHthqvk5JgLtam WPyLScPVm3WtFPmtzf8U5e7K+Z+hXQPXRvwHfXV4AqmAwUythEAhdQnUNHMP4VpfuvMo bT8yPwpYiC6c7XdEXDJzEv2yViJMt6JIfOP2A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698193852; x=1698798652; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=n87sUffC3jIAj0OzBWNWPGKXdWXX/v+Z+ob+S6qU1cI=; b=gQLsG6DpbPGNTUmfECedHlgViv3irrbXmGEVx5FEdfxx1St8LfLMTTyReHOIi3T2dZ 6A0UF2REjCQA0ZH3U2xgdt78/o4HsnSqzVr96hxZUfrAEdi3WYq8FggcvtdpKLWYydFX 0ZfxOXzDKbCGp8o0hbv3bT89IvRoLz3ipkGbdcGwGmknZGOJ6rd/ffGg8aPzOAIdT9M9 mSK1Qu6a82nY4C5Nl7MRaCSgErSIJrfwNyQfe45U/Y60Q8V9chYzqRbjJ/VR9G+qtjLy SsAXjEOOvQMfe8jwedeUhef7yA8udUAZ+G1bvaeiJZ7TuArREJij9U9r+Gg55ooAztDE oPKA== X-Gm-Message-State: AOJu0YxceshCWWyoOkPbJGyni/r+mfbjQcCICyQlPjglo32WvvdpIrWY rIGTSeYbh7RBYXQC8h9LQTle4g== X-Received: by 2002:a05:6870:a99a:b0:1d5:40df:8fb1 with SMTP id ep26-20020a056870a99a00b001d540df8fb1mr16097059oab.19.1698193852500; Tue, 24 Oct 2023 17:30:52 -0700 (PDT) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id n3-20020a632703000000b005ae776b8616sm1343461pgn.19.2023.10.24.17.30.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 17:30:51 -0700 (PDT) Date: Tue, 24 Oct 2023 17:30:51 -0700 From: Kees Cook To: Justin Stitt Cc: "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH] scsi: csiostor: replace deprecated strncpy with strscpy Message-ID: <202310241730.7AA375902@keescook> References: <20231023-strncpy-drivers-scsi-csiostor-csio_init-c-v1-1-5ea445b56864@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231023-strncpy-drivers-scsi-csiostor-csio_init-c-v1-1-5ea445b56864@google.com> 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_BLOCKED,SPF_HELO_NONE,SPF_PASS 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 24 Oct 2023 17:31:02 -0700 (PDT) On Mon, Oct 23, 2023 at 08:26:13PM +0000, Justin Stitt wrote: > strncpy() is deprecated for use on NUL-terminated destination strings > [1] and as such we should prefer more robust and less ambiguous string > interfaces. > > `hw` is kzalloc'd just before this string assignment: > | hw = kzalloc(sizeof(struct csio_hw), GFP_KERNEL); > > ... which means any NUL-padding is redundant. > > Since CSIO_DRV_VERSION is a small string literal (smaller than > sizeof(dest)): > > ... there is functionally no change in this swap from strncpy() to > strscpy(). Nonetheless, let's make the change for robustness' sake -- as > it will ensure that drv_version is _always_ NUL-terminated. > > Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] > Link: https://github.com/KSPP/linux/issues/90 > Cc: linux-hardening@vger.kernel.org > Signed-off-by: Justin Stitt Another direct replacement. Reviewed-by: Kees Cook -- Kees Cook