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 A130F269AE3; Tue, 8 Apr 2025 11:01:24 +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=1744110084; cv=none; b=JDO75LpXA1QnZLC1gFCnCSxDANJuhU2kOQlFc6tz412ty8Sjv0Ps+U3ENL0YizyBlT6bYQLMs45tf9yEaXRFbx8foBwqgKBs3Dxay9+VOxUPoI+n76WKST1+e2HcnrrLzubAqvo0d7HTXLjOOGeumJz6LP7s5DWOjsrFRpLFfVE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744110084; c=relaxed/simple; bh=pIq7tJYaXEzryJ+KCKFrpJcY2SJQAXep5hVAtvl0HWI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pSmn2D54nTruoWmoSfWmVQIU3tqUQLPuCWt9thbOeC1zbj+lSfwQUheQp8PhqGAendIFGU1we9S94aXjO+dJ6VaC5kZIyr0ZufOsp5i7vTR4woEFqFDdWt7IQIQOkI0PSK9lzmlHvhS5P0eS7elSeECLEx/FeibLcMVcAJBqOgA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cyJH+nyy; 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="cyJH+nyy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F66EC4CEE5; Tue, 8 Apr 2025 11:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744110084; bh=pIq7tJYaXEzryJ+KCKFrpJcY2SJQAXep5hVAtvl0HWI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cyJH+nyyepb3T41UEbWU1YtiPE4ELB3YAQEJ0enbQWqur1bOIEz+59K6WqkA501M8 pt9gGYjBh3vHGdQGXExkukHTLtIoOSCBUETvyqaFnlsk9qMTbL8x4/n9Pi5TA3p7/K 49r8dTN/lUZZ4vdNGYAXpqguY2Q4Np5dr/veU65c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wenkai Lin , Chenghai Huang , Herbert Xu , Sasha Levin Subject: [PATCH 5.10 161/227] crypto: hisilicon/sec2 - fix for aead auth key length Date: Tue, 8 Apr 2025 12:48:59 +0200 Message-ID: <20250408104825.146409452@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.353768086@linuxfoundation.org> References: <20250408104820.353768086@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wenkai Lin [ Upstream commit 1b284ffc30b02808a0de698667cbcf5ce5f9144e ] According to the HMAC RFC, the authentication key can be 0 bytes, and the hardware can handle this scenario. Therefore, remove the incorrect validation for this case. Fixes: 2f072d75d1ab ("crypto: hisilicon - Add aead support on SEC2") Signed-off-by: Wenkai Lin Signed-off-by: Chenghai Huang Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/hisilicon/sec2/sec_crypto.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hisilicon/sec2/sec_crypto.c index 2dbec638cca83..ce2ff9538c8dc 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -856,11 +856,6 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx, struct crypto_shash *hash_tfm = ctx->hash_tfm; int blocksize, ret; - if (!keys->authkeylen) { - pr_err("hisi_sec2: aead auth key error!\n"); - return -EINVAL; - } - blocksize = crypto_shash_blocksize(hash_tfm); if (keys->authkeylen > blocksize) { ret = crypto_shash_tfm_digest(hash_tfm, keys->authkey, @@ -871,7 +866,8 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx, } ctx->a_key_len = blocksize; } else { - memcpy(ctx->a_key, keys->authkey, keys->authkeylen); + if (keys->authkeylen) + memcpy(ctx->a_key, keys->authkey, keys->authkeylen); ctx->a_key_len = keys->authkeylen; } -- 2.39.5