Commit 61f4769a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux 

Pull crypto library fixes from Eric Biggers:

 - Fix a regression in the arm64 Poly1305 code

 - Fix a couple compiler warnings

* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crypto/poly1305: Fix arm64's poly1305_blocks_arch()
  lib/crypto/curve25519-hacl64: Disable KASAN with clang-17 and older
  lib/crypto: Annotate crypto strings with nonstring
parents 5adb6350 9d4204a8

arch/arm64/lib/crypto/poly1305-glue.c

+2 −2
Original line number Diff line number Diff line
@@ -38,14 +38,14 @@ void poly1305_blocks_arch(struct poly1305_block_state *state, const u8 *src, 
			unsigned int todo = min_t(unsigned int, len, SZ_4K);



			kernel_neon_begin();

			poly1305_blocks_neon(state, src, todo, 1);

			poly1305_blocks_neon(state, src, todo, padbit);

			kernel_neon_end();



			len -= todo;

			src += todo;

		} while (len);

	} else

		poly1305_blocks(state, src, len, 1);

		poly1305_blocks(state, src, len, padbit);

}

EXPORT_SYMBOL_GPL(poly1305_blocks_arch);

lib/crypto/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ obj-$(CONFIG_CRYPTO_LIB_CURVE25519_GENERIC) += libcurve25519-generic.o 
libcurve25519-generic-y				:= curve25519-fiat32.o

libcurve25519-generic-$(CONFIG_ARCH_SUPPORTS_INT128)	:= curve25519-hacl64.o

libcurve25519-generic-y				+= curve25519-generic.o

# clang versions prior to 18 may blow out the stack with KASAN

ifeq ($(call clang-min-version, 180000),)

KASAN_SANITIZE_curve25519-hacl64.o := n

endif



obj-$(CONFIG_CRYPTO_LIB_CURVE25519)		+= libcurve25519.o

libcurve25519-y					+= curve25519.o

lib/crypto/aescfb.c

+4 −4
Original line number Diff line number Diff line
@@ -106,11 +106,11 @@ MODULE_LICENSE("GPL"); 
 */



static struct {

	u8	ptext[64];

	u8	ctext[64];

	u8	ptext[64] __nonstring;

	u8	ctext[64] __nonstring;



	u8	key[AES_MAX_KEY_SIZE];

	u8	iv[AES_BLOCK_SIZE];

	u8	key[AES_MAX_KEY_SIZE] __nonstring;

	u8	iv[AES_BLOCK_SIZE] __nonstring;



	int	klen;

	int	len;

lib/crypto/aesgcm.c

+23 −23
Original line number Diff line number Diff line
@@ -205,19 +205,19 @@ MODULE_LICENSE("GPL"); 
 * Test code below. Vectors taken from crypto/testmgr.h

 */



static const u8 __initconst ctext0[16] =

static const u8 __initconst ctext0[16] __nonstring =

	"\x58\xe2\xfc\xce\xfa\x7e\x30\x61"

	"\x36\x7f\x1d\x57\xa4\xe7\x45\x5a";



static const u8 __initconst ptext1[16];



static const u8 __initconst ctext1[32] =

static const u8 __initconst ctext1[32] __nonstring =

	"\x03\x88\xda\xce\x60\xb6\xa3\x92"

	"\xf3\x28\xc2\xb9\x71\xb2\xfe\x78"

	"\xab\x6e\x47\xd4\x2c\xec\x13\xbd"

	"\xf5\x3a\x67\xb2\x12\x57\xbd\xdf";



static const u8 __initconst ptext2[64] =

static const u8 __initconst ptext2[64] __nonstring =

	"\xd9\x31\x32\x25\xf8\x84\x06\xe5"

	"\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"

	"\x86\xa7\xa9\x53\x15\x34\xf7\xda"
@@ -227,7 +227,7 @@ static const u8 __initconst ptext2[64] = 
	"\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"

	"\xba\x63\x7b\x39\x1a\xaf\xd2\x55";



static const u8 __initconst ctext2[80] =

static const u8 __initconst ctext2[80] __nonstring =

	"\x42\x83\x1e\xc2\x21\x77\x74\x24"

	"\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"

	"\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"
@@ -239,7 +239,7 @@ static const u8 __initconst ctext2[80] = 
	"\x4d\x5c\x2a\xf3\x27\xcd\x64\xa6"

	"\x2c\xf3\x5a\xbd\x2b\xa6\xfa\xb4";



static const u8 __initconst ptext3[60] =

static const u8 __initconst ptext3[60] __nonstring =

	"\xd9\x31\x32\x25\xf8\x84\x06\xe5"

	"\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"

	"\x86\xa7\xa9\x53\x15\x34\xf7\xda"
@@ -249,7 +249,7 @@ static const u8 __initconst ptext3[60] = 
	"\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"

	"\xba\x63\x7b\x39";



static const u8 __initconst ctext3[76] =

static const u8 __initconst ctext3[76] __nonstring =

	"\x42\x83\x1e\xc2\x21\x77\x74\x24"

	"\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"

	"\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"
@@ -261,17 +261,17 @@ static const u8 __initconst ctext3[76] = 
	"\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb"

	"\x94\xfa\xe9\x5a\xe7\x12\x1a\x47";



static const u8 __initconst ctext4[16] =

static const u8 __initconst ctext4[16] __nonstring =

	"\xcd\x33\xb2\x8a\xc7\x73\xf7\x4b"

	"\xa0\x0e\xd1\xf3\x12\x57\x24\x35";



static const u8 __initconst ctext5[32] =

static const u8 __initconst ctext5[32] __nonstring =

	"\x98\xe7\x24\x7c\x07\xf0\xfe\x41"

	"\x1c\x26\x7e\x43\x84\xb0\xf6\x00"

	"\x2f\xf5\x8d\x80\x03\x39\x27\xab"

	"\x8e\xf4\xd4\x58\x75\x14\xf0\xfb";



static const u8 __initconst ptext6[64] =

static const u8 __initconst ptext6[64] __nonstring =

	"\xd9\x31\x32\x25\xf8\x84\x06\xe5"

	"\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"

	"\x86\xa7\xa9\x53\x15\x34\xf7\xda"
@@ -281,7 +281,7 @@ static const u8 __initconst ptext6[64] = 
	"\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"

	"\xba\x63\x7b\x39\x1a\xaf\xd2\x55";



static const u8 __initconst ctext6[80] =

static const u8 __initconst ctext6[80] __nonstring =

	"\x39\x80\xca\x0b\x3c\x00\xe8\x41"

	"\xeb\x06\xfa\xc4\x87\x2a\x27\x57"

	"\x85\x9e\x1c\xea\xa6\xef\xd9\x84"
@@ -293,17 +293,17 @@ static const u8 __initconst ctext6[80] = 
	"\x99\x24\xa7\xc8\x58\x73\x36\xbf"

	"\xb1\x18\x02\x4d\xb8\x67\x4a\x14";



static const u8 __initconst ctext7[16] =

static const u8 __initconst ctext7[16] __nonstring =

	"\x53\x0f\x8a\xfb\xc7\x45\x36\xb9"

	"\xa9\x63\xb4\xf1\xc4\xcb\x73\x8b";



static const u8 __initconst ctext8[32] =

static const u8 __initconst ctext8[32] __nonstring =

	"\xce\xa7\x40\x3d\x4d\x60\x6b\x6e"

	"\x07\x4e\xc5\xd3\xba\xf3\x9d\x18"

	"\xd0\xd1\xc8\xa7\x99\x99\x6b\xf0"

	"\x26\x5b\x98\xb5\xd4\x8a\xb9\x19";



static const u8 __initconst ptext9[64] =

static const u8 __initconst ptext9[64] __nonstring =

	"\xd9\x31\x32\x25\xf8\x84\x06\xe5"

	"\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"

	"\x86\xa7\xa9\x53\x15\x34\xf7\xda"
@@ -313,7 +313,7 @@ static const u8 __initconst ptext9[64] = 
	"\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"

	"\xba\x63\x7b\x39\x1a\xaf\xd2\x55";



static const u8 __initconst ctext9[80] =

static const u8 __initconst ctext9[80] __nonstring =

	"\x52\x2d\xc1\xf0\x99\x56\x7d\x07"

	"\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"

	"\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"
@@ -325,7 +325,7 @@ static const u8 __initconst ctext9[80] = 
	"\xb0\x94\xda\xc5\xd9\x34\x71\xbd"

	"\xec\x1a\x50\x22\x70\xe3\xcc\x6c";



static const u8 __initconst ptext10[60] =

static const u8 __initconst ptext10[60] __nonstring =

	"\xd9\x31\x32\x25\xf8\x84\x06\xe5"

	"\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"

	"\x86\xa7\xa9\x53\x15\x34\xf7\xda"
@@ -335,7 +335,7 @@ static const u8 __initconst ptext10[60] = 
	"\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"

	"\xba\x63\x7b\x39";



static const u8 __initconst ctext10[76] =

static const u8 __initconst ctext10[76] __nonstring =

	"\x52\x2d\xc1\xf0\x99\x56\x7d\x07"

	"\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"

	"\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"
@@ -347,7 +347,7 @@ static const u8 __initconst ctext10[76] = 
	"\x76\xfc\x6e\xce\x0f\x4e\x17\x68"

	"\xcd\xdf\x88\x53\xbb\x2d\x55\x1b";



static const u8 __initconst ptext11[60] =

static const u8 __initconst ptext11[60] __nonstring =

	"\xd9\x31\x32\x25\xf8\x84\x06\xe5"

	"\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"

	"\x86\xa7\xa9\x53\x15\x34\xf7\xda"
@@ -357,7 +357,7 @@ static const u8 __initconst ptext11[60] = 
	"\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"

	"\xba\x63\x7b\x39";



static const u8 __initconst ctext11[76] =

static const u8 __initconst ctext11[76] __nonstring =

	"\x39\x80\xca\x0b\x3c\x00\xe8\x41"

	"\xeb\x06\xfa\xc4\x87\x2a\x27\x57"

	"\x85\x9e\x1c\xea\xa6\xef\xd9\x84"
@@ -369,7 +369,7 @@ static const u8 __initconst ctext11[76] = 
	"\x25\x19\x49\x8e\x80\xf1\x47\x8f"

	"\x37\xba\x55\xbd\x6d\x27\x61\x8c";



static const u8 __initconst ptext12[719] =

static const u8 __initconst ptext12[719] __nonstring =

	"\x42\xc1\xcc\x08\x48\x6f\x41\x3f"

	"\x2f\x11\x66\x8b\x2a\x16\xf0\xe0"

	"\x58\x83\xf0\xc3\x70\x14\xc0\x5b"
@@ -461,7 +461,7 @@ static const u8 __initconst ptext12[719] = 
	"\x59\xfa\xfa\xaa\x44\x04\x01\xa7"

	"\xa4\x78\xdb\x74\x3d\x8b\xb5";



static const u8 __initconst ctext12[735] =

static const u8 __initconst ctext12[735] __nonstring =

	"\x84\x0b\xdb\xd5\xb7\xa8\xfe\x20"

	"\xbb\xb1\x12\x7f\x41\xea\xb3\xc0"

	"\xa2\xb4\x37\x19\x11\x58\xb6\x0b"
@@ -559,9 +559,9 @@ static struct { 
	const u8	*ptext;

	const u8	*ctext;



	u8		key[AES_MAX_KEY_SIZE];

	u8		iv[GCM_AES_IV_SIZE];

	u8		assoc[20];

	u8		key[AES_MAX_KEY_SIZE] __nonstring;

	u8		iv[GCM_AES_IV_SIZE] __nonstring;

	u8		assoc[20] __nonstring;



	int		klen;

	int		clen;