From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40BCC25A337; Mon, 23 Jun 2025 13:34:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685658; cv=none; b=rX39e7OKcFlI7lF3G7wiICT4dTMCeIMHyUlGww7j5SoLF9vI61SKN7DCidZbBAqDJ8HdbCmJW0ZWvnk8RsuAaOFsT6FpS89DaSrcGQAG2AvZfAkWruHzLWbOBzg3yZqsOFkkZJRrVfbh4IsHGs9ivUJNLv3lh5B+VGP/JYZXvy0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685658; c=relaxed/simple; bh=J9IIJtkGllz5g5vYTfsbRA3GDMTGLGOWizqkW69RGlw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g33Kf9Xoei4qhbYHtfQWAKjK/howHHcM+c421GmsVD+HJtWh1lb26l01yncSZoI2GkAhOfxvbv/OmGB16f8sLO93sHVhmzUqODON2BVUgjEKqQIxm7db4IncWfIExSrHOpBo1dg9BqwLPVIfiGPUTyNIclLxPX64l0CJUarigKE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Phq64kDC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Phq64kDC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73ABDC4CEF0; Mon, 23 Jun 2025 13:34:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750685656; bh=J9IIJtkGllz5g5vYTfsbRA3GDMTGLGOWizqkW69RGlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Phq64kDCfev+Fo0mKnRknwysyowFcx2DQRFIfMzO3ld20z/XgLNOZ3grzpeUixQu/ 9lxpxXm6oIe7DcBH6Sfvu0ZaBxR/ePhStO8KI1CPZ5cHx757Il9/lr1vQuIBrSUUHf ikuGcp6osJKVzTyhWPBblzS55TjTT3Ml3dWCleFc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, kernel test robot , Herbert Xu , Sasha Levin Subject: [PATCH 6.1 022/508] crypto: lrw - Only add ecb if it is not already there Date: Mon, 23 Jun 2025 15:01:07 +0200 Message-ID: <20250623130645.796650060@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130645.255320792@linuxfoundation.org> References: <20250623130645.255320792@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Herbert Xu [ Upstream commit 3d73909bddc2ebb3224a8bc2e5ce00e9df70c15d ] Only add ecb to the cipher name if it isn't already ecb. Also use memcmp instead of strncmp since these strings are all stored in an array of length CRYPTO_MAX_ALG_NAME. Fixes: 700cb3f5fe75 ("crypto: lrw - Convert to skcipher") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202505151503.d8a6cf10-lkp@intel.com Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- crypto/lrw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/lrw.c b/crypto/lrw.c index fb8892ed179f5..99d9eb67e1827 100644 --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -322,7 +322,7 @@ static int lrw_create(struct crypto_template *tmpl, struct rtattr **tb) err = crypto_grab_skcipher(spawn, skcipher_crypto_instance(inst), cipher_name, 0, mask); - if (err == -ENOENT) { + if (err == -ENOENT && memcmp(cipher_name, "ecb(", 4)) { err = -ENAMETOOLONG; if (snprintf(ecb_name, CRYPTO_MAX_ALG_NAME, "ecb(%s)", cipher_name) >= CRYPTO_MAX_ALG_NAME) @@ -356,7 +356,7 @@ static int lrw_create(struct crypto_template *tmpl, struct rtattr **tb) /* Alas we screwed up the naming so we have to mangle the * cipher name. */ - if (!strncmp(cipher_name, "ecb(", 4)) { + if (!memcmp(cipher_name, "ecb(", 4)) { int len; len = strscpy(ecb_name, cipher_name + 4, sizeof(ecb_name)); -- 2.39.5