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 4DF75230BC2; Mon, 23 Jun 2025 13:27:09 +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=1750685229; cv=none; b=DxwapYjocX5zgNLankXF7e5rv1YHR/ovH57DtVoZ1hnp6FBkQDsXOdI4AYCdzmkDJ45d0zXlkE69wal1Fg2YkD76T/SubNjFDwQTvoUay9Xa+DIz6Q0d1Ji0Mh0R0ABngXJSrMz3IpexgLT77gQq+lO7gPKAb9zOQ58AHCruivs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750685229; c=relaxed/simple; bh=xTrcVMI5W3sWK1tR9k3J/SLH6EGU5QQOy64PPK0RuZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AE/iCvyou3Llbmnc0OtDWlWEt5pBHywokFdBSb9ZN+sxKbvMULbGFUKAMfCnYmKp3xIluWLqoVLC4eN2s81ah+AGviMMQ/EZ1wIwLAcz/iSP6AJI8gA4tJ0ryZ8fOjm8ed9SN61YYZm9iGNiMbFSioTNv+8RJHJfDvmkKAXh3mQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vj4xM7Nx; 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="Vj4xM7Nx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7BDFC4CEEA; Mon, 23 Jun 2025 13:27:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750685229; bh=xTrcVMI5W3sWK1tR9k3J/SLH6EGU5QQOy64PPK0RuZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vj4xM7Nx8M1V8KUsay/CinPIXXB6ALGd/NK/qZ7on2MDCfH/72MnC2Xc1MhnVNfzp pFOeHk1A63BuYm2AAb9gEzxPtnqUUTB2OWmyfwixnaSVejU2wUEKjEhpLvAILIrXVc HyWRaEoioRGuTmvDXcuX1NQSeiadePMKX+EtqJys= 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 5.15 018/411] crypto: lrw - Only add ecb if it is not already there Date: Mon, 23 Jun 2025 15:02:42 +0200 Message-ID: <20250623130633.546531113@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130632.993849527@linuxfoundation.org> References: <20250623130632.993849527@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 80d9076e42e0b..7adc105c12f71 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