From mboxrd@z Thu Jan 1 00:00:00 1970 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 44440C83F16 for ; Wed, 30 Aug 2023 22:39:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343917AbjH3WjW (ORCPT ); Wed, 30 Aug 2023 18:39:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343890AbjH3WjU (ORCPT ); Wed, 30 Aug 2023 18:39:20 -0400 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC769CE0 for ; Wed, 30 Aug 2023 15:38:54 -0700 (PDT) Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-53fa455cd94so231606a12.2 for ; Wed, 30 Aug 2023 15:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693435134; x=1694039934; 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=YomMerHxi5chwbf+vSfxIXZNG+5ikh/ZEAP8HjV/WpE=; b=Z2SFLu0dUWMWp4V6Hc5r+JJ17A96XygW3BCDRQqCbharqzUnfYaH7X74cEtmQ9Q9sU XmUZGbX8QFc22NMddBLHiFDiCgRhvyQmaAlRXwbkh+K9EgMxzAWSttdjtjnFa4dNL3Hg +/qTxkhAAfReRQ8b+nXtUijyhq/rXTkdleAaw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693435134; x=1694039934; 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=YomMerHxi5chwbf+vSfxIXZNG+5ikh/ZEAP8HjV/WpE=; b=ZZZsNpYUyaH7Wm0VGF/x6Ph7Xcxel6gpUunnKyMhTPvvA1THhtXU56T9eUGuAWjdO0 XDWfZyggtQ7ePUbWGGIt8AZt7Efom8P7kSOiBkELre80R1bMz2OmrLjVCMfF85ojI4QD JFZqWPoNEZj6RcepP5QKpqlc1LThcEb4AVIhignVWnuDgbfe8WmgMhNn3n51MbFT4zAP csa+DKQ5B1KCOl4M9SQhSKWUhSB/mJUHfqVaOAT3r8nfFp47bkM6F64uwpQhbUcpyICs cc6RWowV4jTndBLrFKW6nsBwjr1A0z2TC2AqL75xPXOVab+bQJaAIuMSKVqGMM7nCSMv YLiQ== X-Gm-Message-State: AOJu0YwCGpNzr2cm8EVPf5SpwjmJPiMd23tVSoi0JX9YwdifPKqlRFOA OutIgCZAgCpFGJ/089n25vaYsw== X-Google-Smtp-Source: AGHT+IF+ryOPlq201gHOojr77+5qokJqMKiAi/Tu3pX1ZAe2um3TaACN8YRegkwzzG6rZvmRx+5VKg== X-Received: by 2002:a05:6a20:9691:b0:131:b3fa:eaaa with SMTP id hp17-20020a056a20969100b00131b3faeaaamr2962535pzc.61.1693435134082; Wed, 30 Aug 2023 15:38:54 -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 e22-20020aa78256000000b0068c676f1df7sm81729pfn.57.2023.08.30.15.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Aug 2023 15:38:53 -0700 (PDT) Date: Wed, 30 Aug 2023 15:38:53 -0700 From: Kees Cook To: Azeem Shaikh Cc: "Martin K. Petersen" , linux-hardening@vger.kernel.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] scsi: target: Replace strlcpy with strscpy Message-ID: <202308301537.88398E90BB@keescook> References: <20230830210724.4156575-1-azeemshaikh38@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230830210724.4156575-1-azeemshaikh38@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 30, 2023 at 09:07:24PM +0000, Azeem Shaikh wrote: > strlcpy() reads the entire source buffer first. > This read may exceed the destination size limit. > This is both inefficient and can lead to linear read > overflows if a source string is not NUL-terminated [1]. > In an effort to remove strlcpy() completely [2], replace > strlcpy() here with strscpy(). > > Direct replacement is safe here since return value of -errno > is used to check for truncation instead of sizeof(dest). > > [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy > [2] https://github.com/KSPP/linux/issues/89 > > Signed-off-by: Azeem Shaikh > --- > v2: > * Replace all instances of strlcpy in this file instead of just 1. > > v1: > * https://lore.kernel.org/all/20230830200717.4129442-1-azeemshaikh38@gmail.com/ > > drivers/target/target_core_configfs.c | 27 ++++++++++++--------------- > 1 file changed, 12 insertions(+), 15 deletions(-) > > diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c > index 936e5ff1b209..10a22a428267 100644 > --- a/drivers/target/target_core_configfs.c > +++ b/drivers/target/target_core_configfs.c > @@ -1392,16 +1392,15 @@ static ssize_t target_wwn_vendor_id_store(struct config_item *item, > /* +2 to allow for a trailing (stripped) '\n' and null-terminator */ > unsigned char buf[INQUIRY_VENDOR_LEN + 2]; > char *stripped = NULL; > - size_t len; > + ssize_t len; > ssize_t ret; > > - len = strlcpy(buf, page, sizeof(buf)); > - if (len < sizeof(buf)) { > + len = strscpy(buf, page, sizeof(buf)); > + if (len > 0) { > /* Strip any newline added from userspace. */ > stripped = strstrip(buf); > - len = strlen(stripped); > } > - if (len > INQUIRY_VENDOR_LEN) { > + if (len < 0 || strlen(stripped) > INQUIRY_VENDOR_LEN) { > pr_err("Emulated T10 Vendor Identification exceeds" > " INQUIRY_VENDOR_LEN: " __stringify(INQUIRY_VENDOR_LEN) > "\n"); I would find these more readable if the "len = strlen" were left and the final "if" becomes: if (len < 0 || len > INQUIRY_VENDOR_LEN) > @@ -1448,16 +1447,15 @@ static ssize_t target_wwn_product_id_store(struct config_item *item, > /* +2 to allow for a trailing (stripped) '\n' and null-terminator */ > unsigned char buf[INQUIRY_MODEL_LEN + 2]; > char *stripped = NULL; > - size_t len; > + ssize_t len; > ssize_t ret; > > - len = strlcpy(buf, page, sizeof(buf)); > - if (len < sizeof(buf)) { > + len = strscpy(buf, page, sizeof(buf)); > + if (len > 0) { > /* Strip any newline added from userspace. */ > stripped = strstrip(buf); > - len = strlen(stripped); > } > - if (len > INQUIRY_MODEL_LEN) { > + if (len < 0 || strlen(stripped) > INQUIRY_MODEL_LEN) { > pr_err("Emulated T10 Vendor exceeds INQUIRY_MODEL_LEN: " > __stringify(INQUIRY_MODEL_LEN) > "\n"); > @@ -1504,16 +1502,15 @@ static ssize_t target_wwn_revision_store(struct config_item *item, > /* +2 to allow for a trailing (stripped) '\n' and null-terminator */ > unsigned char buf[INQUIRY_REVISION_LEN + 2]; > char *stripped = NULL; > - size_t len; > + ssize_t len; > ssize_t ret; > > - len = strlcpy(buf, page, sizeof(buf)); > - if (len < sizeof(buf)) { > + len = strscpy(buf, page, sizeof(buf)); > + if (len > 0) { > /* Strip any newline added from userspace. */ > stripped = strstrip(buf); > - len = strlen(stripped); > } > - if (len > INQUIRY_REVISION_LEN) { > + if (len < 0 || strlen(stripped) > INQUIRY_REVISION_LEN) { > pr_err("Emulated T10 Revision exceeds INQUIRY_REVISION_LEN: " > __stringify(INQUIRY_REVISION_LEN) > "\n"); > -- > 2.42.0.283.g2d96d420d3-goog > > -- Kees Cook