Commit 90bc52c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.2-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes a CFI crash in arm64/sm4 as well as a regression in the
  caam driver"

* tag 'v6.2-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm64/sm4 - fix possible crash with CFI enabled
  crypto: caam - fix CAAM io mem access in blob_gen
parents 1f5abbd7 736f8868

arch/arm64/crypto/sm4-ce-ccm-core.S

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/cfi_types.h>

#include <asm/assembler.h>

#include "sm4-ce-asm.h"
@@ -104,7 +105,7 @@ SYM_FUNC_START(sm4_ce_ccm_final) 
SYM_FUNC_END(sm4_ce_ccm_final)



.align 3

SYM_FUNC_START(sm4_ce_ccm_enc)

SYM_TYPED_FUNC_START(sm4_ce_ccm_enc)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst
@@ -216,7 +217,7 @@ SYM_FUNC_START(sm4_ce_ccm_enc) 
SYM_FUNC_END(sm4_ce_ccm_enc)



.align 3

SYM_FUNC_START(sm4_ce_ccm_dec)

SYM_TYPED_FUNC_START(sm4_ce_ccm_dec)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst

arch/arm64/crypto/sm4-ce-gcm-core.S

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/linkage.h>

#include <linux/cfi_types.h>

#include <asm/assembler.h>

#include "sm4-ce-asm.h"
@@ -370,7 +371,7 @@ SYM_FUNC_START(pmull_ghash_update) 
SYM_FUNC_END(pmull_ghash_update)



.align 3

SYM_FUNC_START(sm4_ce_pmull_gcm_enc)

SYM_TYPED_FUNC_START(sm4_ce_pmull_gcm_enc)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst
@@ -581,7 +582,7 @@ SYM_FUNC_END(sm4_ce_pmull_gcm_enc) 
#define	RH3	v20



.align 3

SYM_FUNC_START(sm4_ce_pmull_gcm_dec)

SYM_TYPED_FUNC_START(sm4_ce_pmull_gcm_dec)

	/* input:

	 *   x0: round key array, CTX

	 *   x1: dst

drivers/crypto/caam/blob_gen.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ int caam_process_blob(struct caam_blob_priv *priv, 
	}



	ctrlpriv = dev_get_drvdata(jrdev->parent);

	moo = FIELD_GET(CSTA_MOO, ioread32(&ctrlpriv->ctrl->perfmon.status));

	moo = FIELD_GET(CSTA_MOO, rd_reg32(&ctrlpriv->ctrl->perfmon.status));

	if (moo != CSTA_MOO_SECURE && moo != CSTA_MOO_TRUSTED)

		dev_warn(jrdev,

			 "using insecure test key, enable HAB to use unique device key!\n");