From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 019473CAE61; Wed, 20 May 2026 16:40:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779295244; cv=none; b=h8yiOhg+arwn5/EfFA9t+7zAXuLys4VJnMMW5yxDz+NFWY2NPm3mDHWu8b0lwLZrmMPFSPNqSEj6EDLUZjphlJWUglj/FtmI36hf+Isrvl45Jkp505BLGBjUYPQmUIdiBWryMTa1qjJBCSTFO5bbjaT2rnfPX35OFhQIzhxZGxc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779295244; c=relaxed/simple; bh=LOZkud5emEwmzyB5M7NRQPFLieeeX7ui4XZ6gN9O+Uw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sNPc5MXYabCTNFeVBZ5HHVOgxsoiWlRYwnfLGOgYycMw9jGXlBDqM/dKc//CIfr5bN1qjCd9BJnbg82HpnsZgVjDioBdKhMIMQ2f0YMHKTPM7jpth8CwZSurV20skyN8bKZriWKLV/D7++qILBOf+VxWKkJRFKLECVKjuaWxToY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=A/w/ObpU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="A/w/ObpU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 644061F000E9; Wed, 20 May 2026 16:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779295242; bh=KL4PdgzecpxpdPOFn79/ZChbfBsOSAWwz/fvov4Q+ak=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=A/w/ObpURdLW7evx9jjAhPZhrHihwun+bIEJoGwUJ8btxk1AqHDLL3TWyEHuIIUC7 2yTxUte6DvRExuJgsp5zilfL4xRN7axqK5Pf4w/etwal7EJbrjKP/Wagpvfhf/dkgq oOIZ9q18cuxsT8f7OjW41R6qyA21RlmCt2mfit2g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thorsten Blum , Herbert Xu , Sasha Levin Subject: [PATCH 7.0 0305/1146] crypto: atmel-aes - guard unregister on error in atmel_aes_register_algs Date: Wed, 20 May 2026 18:09:15 +0200 Message-ID: <20260520162155.110023205@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162148.390695140@linuxfoundation.org> References: <20260520162148.390695140@linuxfoundation.org> User-Agent: quilt/0.69 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 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thorsten Blum [ Upstream commit 57a13941c0bb06ae24e3b34672d7b6f2172b253f ] Ensure the device supports XTS and GCM with 'has_xts' and 'has_gcm' before unregistering algorithms when XTS or authenc registration fails, which would trigger a WARN in crypto_unregister_alg(). Currently, with the capabilities defined in atmel_aes_get_cap(), this bug cannot happen because all devices that support XTS and authenc also support GCM, but the error handling should still be correct regardless of hardware capabilities. Fixes: d52db5188a87 ("crypto: atmel-aes - add support to the XTS mode") Signed-off-by: Thorsten Blum Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/atmel-aes.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c index 9b0cb97055dc5..b393689400b4c 100644 --- a/drivers/crypto/atmel-aes.c +++ b/drivers/crypto/atmel-aes.c @@ -2270,10 +2270,12 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) /* i = ARRAY_SIZE(aes_authenc_algs); */ err_aes_authenc_alg: crypto_unregister_aeads(aes_authenc_algs, i); - crypto_unregister_skcipher(&aes_xts_alg); + if (dd->caps.has_xts) + crypto_unregister_skcipher(&aes_xts_alg); #endif err_aes_xts_alg: - crypto_unregister_aead(&aes_gcm_alg); + if (dd->caps.has_gcm) + crypto_unregister_aead(&aes_gcm_alg); err_aes_gcm_alg: i = ARRAY_SIZE(aes_algs); err_aes_algs: -- 2.53.0