Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp4926460rdb; Tue, 12 Dec 2023 13:23:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IF2ohqapwb0YmyJvklnYPnsNPt0uF66jRfmxMoOLbK0xhjm1EP7U8e3YWJWb79i4e/cQ+Te X-Received: by 2002:a05:6a00:1d26:b0:6ce:2731:e86d with SMTP id a38-20020a056a001d2600b006ce2731e86dmr7234227pfx.52.1702416194392; Tue, 12 Dec 2023 13:23:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702416194; cv=none; d=google.com; s=arc-20160816; b=isEMk6qdz5rv8k8V2qNG6rgqR1fkvJrMDrMpfc+xiTmHmnG/QAky3IXVRKawfNERYi T7O7nX84N4LRjDmPHjigDp8rt5ddNh5Ts6wEBWtj2fFLecWBjzIGPUJ0U+40bL6fp++n qtCPfX2950oTrq3WKtpyV332+6R+1GxlURb1h13P/s63y5PaJJCIO3GNdeke/k7gEiVR uGY7HYgsi9xAIR3pLudo4ztpEyVS6LaMnQ2l3LayGq1hh3i34wtf8qzzHBDC+ZduM3WJ M6wu8ow3qq+9fFItYXQQSvNpB6UD5ihk62ChkaseYCw8u9RufchYhuheXrASYBOaq3U4 rwlQ== 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=wxuP6rH0bpJQdehhJhYTsKOeIoxa8S/XV7TnZO98Xd8=; fh=ksRvZW4x4hOmWpyTMhEDfKDcl8rTbNf6XNx4FVG1Dqk=; b=LAM7ALvOTjr5c3Ui2v8XznxGtHiRHzMxzvYYWa8Kpasenol3WvbSViocwHxFIZryJl 0tUKvHHg4RSiJGBMLlHiFqKSIY1O1RovBOiTJ1WuD/Mu/t0zJGE70zLk+zV//5XzMnoB me6nhku6p3Goq82o8kaFcXF18dQke1WpdzfiNAuPaIFZpSNH3Hz/q9D19rtN5EZC9Ix3 Bib+2ZKOP9SPjI570Jr2W4BpRn9KXTNLRhQCEc7+B7HS6mB10J4DnR1ImY/znmi/Ccuw JIWbTa9UdSk0iagnfXW5C7R7sF3p8398MkMGjv2Nf1JfBxZkasUl1JL1x9fUeJIDeRss NMig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=mxWuZrxJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id c4-20020a63ef44000000b005c5fe04e4eesi8248411pgk.852.2023.12.12.13.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 13:23:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=mxWuZrxJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id E678580873A1; Tue, 12 Dec 2023 13:23:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377571AbjLLVW6 (ORCPT + 99 others); Tue, 12 Dec 2023 16:22:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377558AbjLLVW5 (ORCPT ); Tue, 12 Dec 2023 16:22:57 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD9ECCE for ; Tue, 12 Dec 2023 13:23:02 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-6cea5548eb2so5477362b3a.0 for ; Tue, 12 Dec 2023 13:23:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1702416182; x=1703020982; 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=wxuP6rH0bpJQdehhJhYTsKOeIoxa8S/XV7TnZO98Xd8=; b=mxWuZrxJdj5bxzeN0YMXVqGpbHbz1nYi4FUG1QpdzI4N9XYOcPH5rnNxNxdtm+ZNLp kXqAL6axnAXTby/KaAJBMQcsQ1uvrrBoWNQwTwvMrU9F7k51SMf00lMl2+us5tV0Rhyd Hl8fW5++UU5chmaZ2SuFlgp+dwjPkj/9od8c8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702416182; x=1703020982; 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=wxuP6rH0bpJQdehhJhYTsKOeIoxa8S/XV7TnZO98Xd8=; b=nwhhU7kX9xuXLyZ6syUFvmVYGUfPpCM6ru2UTrQfzdudy0OIN7TBbGHnjOzi56o5Oe KLPCMBc2OCXKlalPthcH0EX47F08rAZDIYYYA3LBDbAHyGImE33DP+bd1L4sTlbqesKk zmngHBFM47QHQ7GwWzeWONRSSFJaS5ngq1UbRyhiyiYg3rrKZQ1nLXu53VpWRjRD0SOv sgCorGOEUPNua5woI+nWEDW1kaaZ8FBnGJ0kUxCu2MaKNoyJH4J6uRrrK90G09h9EMo1 cTJacPVykPI6VaWfVcPdWIjaS1yK9nz0Xj/e4XvkfjagB2Q3q9dybP6GGAMg5HbA6id4 jskw== X-Gm-Message-State: AOJu0YycdEr3QCkeh2IF3pQoi7IbMAzwNQ7dYcLVhMgAoxb8zPEzem0Y xI//mEwQB2HKy6zppiK6Wy3hOg== X-Received: by 2002:a05:6a00:b53:b0:6ce:6c54:24a7 with SMTP id p19-20020a056a000b5300b006ce6c5424a7mr7792476pfo.1.1702416182255; Tue, 12 Dec 2023 13:23:02 -0800 (PST) Received: from www.outflux.net (198-0-35-241-static.hfc.comcastbusiness.net. [198.0.35.241]) by smtp.gmail.com with ESMTPSA id x20-20020aa793b4000000b006ce4c7ba448sm8592223pff.25.2023.12.12.13.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 13:23:01 -0800 (PST) Date: Tue, 12 Dec 2023 13:23:01 -0800 From: Kees Cook To: Justin Stitt Cc: Michael Cyr , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: Re: [PATCH v2] scsi: ibmvscsi_tgt: replace deprecated strncpy with strscpy Message-ID: <202312121321.E15E09BF@keescook> References: <20231212-strncpy-drivers-scsi-ibmvscsi_tgt-ibmvscsi_tgt-c-v2-1-bdb9a7cd96c8@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231212-strncpy-drivers-scsi-ibmvscsi_tgt-ibmvscsi_tgt-c-v2-1-bdb9a7cd96c8@google.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,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 morse.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 (morse.vger.email [0.0.0.0]); Tue, 12 Dec 2023 13:23:12 -0800 (PST) On Tue, Dec 12, 2023 at 01:20:20AM +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. > > We don't need the NUL-padding behavior that strncpy() provides as vscsi > is NUL-allocated in ibmvscsis_probe() which proceeds to call > ibmvscsis_adapter_info(): > | vscsi = kzalloc(sizeof(*vscsi), GFP_KERNEL); > > ibmvscsis_probe() -> ibmvscsis_handle_crq() -> ibmvscsis_parse_command() > -> ibmvscsis_mad() -> ibmvscsis_process_mad() -> ibmvscsis_adapter_info() > > Following the same idea, `partition_name` is defiend as: > | static char partition_name[PARTITION_NAMELEN] = "UNKNOWN"; > ... which is NUL-padded already, meaning strscpy() is the best option. > > 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. > > However, for cap->name and info let's use strscpy_pad as they are > allocated via dma_alloc_coherent(): > | cap = dma_alloc_coherent(&vscsi->dma_dev->dev, olen, &token, > | GFP_ATOMIC); > & > | info = dma_alloc_coherent(&vscsi->dma_dev->dev, sizeof(*info), &token, > | GFP_ATOMIC); > > 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 This looks good to me. The only question that I haven't seen an answer to from the maintainers is whether this is a __nonstring or not. It really looks like it should be a C String, so with that assumption: Reviewed-by: Kees Cook -Kees -- Kees Cook