Skip to content

Commit d852896

Browse files
Praveen Teja Kundanalamichalsimek
authored andcommitted
crypto: xilinx: aes-gcm: Initialize key source with default value
setkey callback skipped copy of key in tfm_ctx because of invalid tfm_ctx->keysrc value. Initialise default keysrc in tfm_init callback for versal and zynqmp. Signed-off-by: Praveen Teja Kundanala <praveen.teja.kundanala@amd.com> Signed-off-by: Harsh Jain <h.jain@amd.com> Message-ID: <20241029070220.1441194-1-praveen.teja.kundanala@amd.com>
1 parent 86e78fc commit d852896

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/crypto/xilinx/zynqmp-aes-gcm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ struct xilinx_aead_drv_ctx {
9494
struct aead_engine_alg aead;
9595
struct device *dev;
9696
struct crypto_engine *engine;
97+
u8 keysrc;
9798
int (*aes_aead_cipher)(struct aead_request *areq);
9899
int (*fallback_check)(struct zynqmp_aead_tfm_ctx *ctx,
99100
struct aead_request *areq);
@@ -572,6 +573,7 @@ static int aes_aead_init(struct crypto_aead *aead)
572573

573574
drv_ctx = container_of(alg, struct xilinx_aead_drv_ctx, aead.base);
574575
tfm_ctx->dev = drv_ctx->dev;
576+
tfm_ctx->keysrc = drv_ctx->keysrc;
575577

576578
tfm_ctx->fbk_cipher = crypto_alloc_aead(drv_ctx->aead.base.base.cra_name,
577579
0,
@@ -606,6 +608,7 @@ static void zynqmp_aes_aead_exit(struct crypto_aead *aead)
606608
static struct xilinx_aead_drv_ctx zynqmp_aes_drv_ctx = {
607609
.fallback_check = zynqmp_fallback_check,
608610
.aes_aead_cipher = zynqmp_aes_aead_cipher,
611+
.keysrc = ZYNQMP_AES_KUP_KEY,
609612
.aead.base = {
610613
.setkey = zynqmp_aes_aead_setkey,
611614
.setauthsize = zynqmp_aes_aead_setauthsize,
@@ -637,6 +640,7 @@ static struct xilinx_aead_drv_ctx zynqmp_aes_drv_ctx = {
637640
static struct xilinx_aead_drv_ctx versal_aes_drv_ctx = {
638641
.fallback_check = versal_fallback_check,
639642
.aes_aead_cipher = versal_aes_aead_cipher,
643+
.keysrc = VERSAL_AES_USER_KEY_0,
640644
.aead.base = {
641645
.setkey = versal_aes_aead_setkey,
642646
.setauthsize = zynqmp_aes_aead_setauthsize,

0 commit comments

Comments
 (0)