From nobody Sun Feb 8 08:27:35 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 C0EB6C7EE2E for ; Tue, 13 Jun 2023 00:26:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239695AbjFMA0I (ORCPT ); Mon, 12 Jun 2023 20:26:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240400AbjFMAZl (ORCPT ); Mon, 12 Jun 2023 20:25:41 -0400 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E45884EF6; Mon, 12 Jun 2023 17:23:35 -0700 (PDT) Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-33e4e59da95so30486155ab.2; Mon, 12 Jun 2023 17:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686615796; x=1689207796; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=8206uVleRcmenlUn2i22dXepe92OExv7mWA9sV/K12U=; b=BSEHyGmwIli/13S+jTzcgBSD9+BkQSBkh7qCUMxdWHD8DeHngnFoEQhJH0IWxsp8Os dfDojs1txQZDK7SupkV16NSLbrcwdSeGNOHo1U8nl6+S/+dSN1KqNrnpOi61VnhLeJjg WzaqQUge0NeLtbnBj2NI2kTX6OFkfPkevnwVkXihzMAHIuvj0TyKsa8MT1qmlyoER6fy 2XcAyKg7TI51lpyceo6YRGVu+n9TxonWKRq3ODpqTsKRxXBdhtSK2hlX9ETQ0Ix895Ou 9jU7SZFo4a+5rIlBHO0Kt4OUewkDP5ncdafeWUaoi2dU7RGtzwZA5hTN3AvcKBTyYyUg e+XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686615796; x=1689207796; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=8206uVleRcmenlUn2i22dXepe92OExv7mWA9sV/K12U=; b=hJuj2K7u9nFtT3SSd8R9kdgKSB6ZLi7urIH7FFWF7cyu+7gT8zE+wy1C2+D4my+h8/ KWBOROe8+uh09kvt6bBMfgybAnrSYhsDsv6NrLJjcDQuPnENHz98VbYqY6RUNcELUJoa F5vSuHq7Xv864mDis+/CC2a7pfwjlSfexbS5y+EcVv3fIzpw444GdzCRi7q7vIP/Iim9 kdDqD0ozI3Ea6ntF/bRK5N0R+RhO3mwV6m26FpcRIDdmse8FXFTIa8khBTrPJnq1sQ4+ aHHFk1GujdPQUvkbqM6i9BWbBD7VIt89hm2k1kTsQonAEr4rGwUA6NRjB2rJnkwgW0ER zgrg== X-Gm-Message-State: AC+VfDxINk+xwGsQMeYVjmbKTKi77kW8DH2dDBO14AEGlYy38Cx/Sgi6 t2LZ7ebg1Dmg2i1q0dRnWux2jBgu238IsA== X-Google-Smtp-Source: ACHHUZ5qMXaQ/+xAecmpHRzkNglZHV6P9CREnw86RKoOd4pQjnoeXtHmDzB9XspotZ0vLvRbDdmG6g== X-Received: by 2002:a05:6e02:4ca:b0:33a:efd3:add3 with SMTP id f10-20020a056e0204ca00b0033aefd3add3mr9704388ils.14.1686615796412; Mon, 12 Jun 2023 17:23:16 -0700 (PDT) Received: from azeems-kspp.c.googlers.com.com (54.70.188.35.bc.googleusercontent.com. [35.188.70.54]) by smtp.gmail.com with ESMTPSA id p6-20020a92c606000000b003319d8574e2sm3534076ilm.25.2023.06.12.17.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 17:23:15 -0700 (PDT) From: Azeem Shaikh To: Herbert Xu , "David S. Miller" Cc: linux-hardening@vger.kernel.org, Azeem Shaikh , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: Replace strlcpy with strscpy Date: Tue, 13 Jun 2023 00:22:58 +0000 Message-ID: <20230613002258.3535506-1-azeemshaikh38@gmail.com> X-Mailer: git-send-email 2.41.0.162.gfafddb0af9-goog MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 -E2BIG 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 --- crypto/lrw.c | 4 ++-- crypto/xts.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/lrw.c b/crypto/lrw.c index 1b0f76ba3eb5..bb8c1575645b 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -359,8 +359,8 @@ static int lrw_create(struct crypto_template *tmpl, str= uct rtattr **tb) if (!strncmp(cipher_name, "ecb(", 4)) { unsigned len; =20 - len =3D strlcpy(ecb_name, cipher_name + 4, sizeof(ecb_name)); - if (len < 2 || len >=3D sizeof(ecb_name)) + len =3D strscpy(ecb_name, cipher_name + 4, sizeof(ecb_name)); + if (len < 2) goto err_free_inst; =20 if (ecb_name[len - 1] !=3D ')') diff --git a/crypto/xts.c b/crypto/xts.c index 09be909a6a1a..8a9f9653426e 100644 --- a/crypto/xts.c +++ b/crypto/xts.c @@ -398,8 +398,8 @@ static int xts_create(struct crypto_template *tmpl, str= uct rtattr **tb) if (!strncmp(cipher_name, "ecb(", 4)) { unsigned len; =20 - len =3D strlcpy(ctx->name, cipher_name + 4, sizeof(ctx->name)); - if (len < 2 || len >=3D sizeof(ctx->name)) + len =3D strscpy(ctx->name, cipher_name + 4, sizeof(ctx->name)); + if (len < 2) goto err_free_inst; =20 if (ctx->name[len - 1] !=3D ')') --=20 2.41.0.162.gfafddb0af9-goog