Without this patch, the chacha block counter is not incremented on neon rounds, resulting in incorrect calculations and corrupt packets. This also switches to using `--no-numbered --zero-commit` so that future diffs are smaller. Reported-by: Hans Geiblinger <cybrnook2002@yahoo.com> Reviewed-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
		
			
				
	
	
		
			38 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			38 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
						|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 | 
						|
Date: Fri, 15 Jan 2021 20:30:12 +0100
 | 
						|
Subject: [PATCH] crypto: lib/chacha20poly1305 - define empty module exit
 | 
						|
 function
 | 
						|
 | 
						|
commit ac88c322d0f2917d41d13553c69e9d7f043c8b6f upstream.
 | 
						|
 | 
						|
With no mod_exit function, users are unable to unload the module after
 | 
						|
use. I'm not aware of any reason why module unloading should be
 | 
						|
prohibited for this one, so this commit simply adds an empty exit
 | 
						|
function.
 | 
						|
 | 
						|
Reported-and-tested-by: John Donnelly <john.p.donnelly@oracle.com>
 | 
						|
Acked-by: Ard Biesheuvel <ardb@kernel.org>
 | 
						|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 | 
						|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
 | 
						|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 | 
						|
---
 | 
						|
 lib/crypto/chacha20poly1305.c | 5 +++++
 | 
						|
 1 file changed, 5 insertions(+)
 | 
						|
 | 
						|
--- a/lib/crypto/chacha20poly1305.c
 | 
						|
+++ b/lib/crypto/chacha20poly1305.c
 | 
						|
@@ -364,7 +364,12 @@ static int __init mod_init(void)
 | 
						|
 	return 0;
 | 
						|
 }
 | 
						|
 
 | 
						|
+static void __exit mod_exit(void)
 | 
						|
+{
 | 
						|
+}
 | 
						|
+
 | 
						|
 module_init(mod_init);
 | 
						|
+module_exit(mod_exit);
 | 
						|
 MODULE_LICENSE("GPL v2");
 | 
						|
 MODULE_DESCRIPTION("ChaCha20Poly1305 AEAD construction");
 | 
						|
 MODULE_AUTHOR("Jason A. Donenfeld <Jason@zx2c4.com>");
 |