chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools-hardened/desktop loop-AES-kernel.patch: Updates to kernel 3.19 compliant patch

Browse source
This commit is contained in:
Devan Franchini 2015-03-28 20:00:38 -04:00
parent c2e64ad3f5
commit 0e6afac162
1 changed files with 51 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
tools-hardened/desktop/configs/loop-AES-kernel.patch
View file

@ -3,9 +3,9 @@ include/linux/loop.h source files must be removed:
rm -f drivers/block/loop.c include/linux/loop.h rm -f drivers/block/loop.c include/linux/loop.h
diff -urN linux-3.14-noloop/drivers/block/Kconfig linux-3.14-AES/drivers/block/Kconfig diff -urN linux-3.19-noloop/drivers/block/Kconfig linux-3.19-AES/drivers/block/Kconfig
--- linux-3.14-noloop/drivers/block/Kconfig 2014-03-31 06:40:15.000000000 +0300 --- linux-3.19-noloop/drivers/block/Kconfig 2015-02-09 04:54:22.000000000 +0200
+++ linux-3.14-AES/drivers/block/Kconfig 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/block/Kconfig 2015-02-09 20:49:52.000000000 +0200
@@ -235,14 +235,6 @@ @@ -235,14 +235,6 @@
bits of, say, a sound file). This is also safe if the file resides bits of, say, a sound file). This is also safe if the file resides
on a remote file server. on a remote file server.
@ -88,10 +88,10 @@ diff -urN linux-3.14-noloop/drivers/block/Kconfig linux-3.14-AES/drivers/block/K
source "drivers/block/drbd/Kconfig" source "drivers/block/drbd/Kconfig"
diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/loop.c diff -urN linux-3.19-noloop/drivers/block/loop.c linux-3.19-AES/drivers/block/loop.c
--- linux-3.14-noloop/drivers/block/loop.c 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/block/loop.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/block/loop.c 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/block/loop.c 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,3278 @@ @@ -0,0 +1,3279 @@
+/* +/*
+ * linux/drivers/block/loop.c + * linux/drivers/block/loop.c
+ * + *
@ -2581,7 +2581,7 @@ diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/lo
+ blk_queue_max_segment_size(lo->lo_queue, PAGE_CACHE_SIZE); + blk_queue_max_segment_size(lo->lo_queue, PAGE_CACHE_SIZE);
+ blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1); + blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1);
+ blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS); + blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS);
+ blk_queue_max_hw_sectors(lo->lo_queue, BLK_DEF_MAX_SECTORS); + blk_queue_max_hw_sectors(lo->lo_queue, 1024);
+ lo->lo_queue->limits.cluster = 0; + lo->lo_queue->limits.cluster = 0;
+ blk_queue_flush(lo->lo_queue, 0); + blk_queue_flush(lo->lo_queue, 0);
+ lo->lo_backingQueue = 0; + lo->lo_backingQueue = 0;
@ -2593,6 +2593,7 @@ diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/lo
+ struct request_queue *q = bdev_get_queue(lo_device); + struct request_queue *q = bdev_get_queue(lo_device);
+ +
+ blk_queue_logical_block_size(lo->lo_queue, queue_logical_block_size(q)); + blk_queue_logical_block_size(lo->lo_queue, queue_logical_block_size(q));
+ blk_queue_physical_block_size(lo->lo_queue, queue_physical_block_size(q));
+ blk_queue_flush(lo->lo_queue, q->flush_flags & (REQ_FLUSH | REQ_FUA)); + blk_queue_flush(lo->lo_queue, q->flush_flags & (REQ_FLUSH | REQ_FUA));
+ lo->lo_queue->limits.io_min = q->limits.io_min; + lo->lo_queue->limits.io_min = q->limits.io_min;
+ if(lo->lo_queue->limits.io_min > (BLK_MAX_SEGMENTS * PAGE_CACHE_SIZE)) + if(lo->lo_queue->limits.io_min > (BLK_MAX_SEGMENTS * PAGE_CACHE_SIZE))
@ -3370,9 +3371,9 @@ diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/lo
+} +}
+EXPORT_SYMBOL(loop_add_keyscrub_fn); +EXPORT_SYMBOL(loop_add_keyscrub_fn);
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/Makefile linux-3.14-AES/drivers/misc/Makefile diff -urN linux-3.19-noloop/drivers/misc/Makefile linux-3.19-AES/drivers/misc/Makefile
--- linux-3.14-noloop/drivers/misc/Makefile 2014-03-31 06:40:15.000000000 +0300 --- linux-3.19-noloop/drivers/misc/Makefile 2015-02-09 04:54:22.000000000 +0200
+++ linux-3.14-AES/drivers/misc/Makefile 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/Makefile 2015-02-09 20:49:52.000000000 +0200
@@ -2,6 +2,33 @@ @@ -2,6 +2,33 @@
# Makefile for misc devices that really don't fit anywhere else. # Makefile for misc devices that really don't fit anywhere else.
# #
@ -3407,9 +3408,9 @@ diff -urN linux-3.14-noloop/drivers/misc/Makefile linux-3.14-AES/drivers/misc/Ma
obj-$(CONFIG_IBM_ASM) += ibmasm/ obj-$(CONFIG_IBM_ASM) += ibmasm/
obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o
obj-$(CONFIG_AD525X_DPOT_I2C) += ad525x_dpot-i2c.o obj-$(CONFIG_AD525X_DPOT_I2C) += ad525x_dpot-i2c.o
diff -urN linux-3.14-noloop/drivers/misc/aes-amd64.S linux-3.14-AES/drivers/misc/aes-amd64.S diff -urN linux-3.19-noloop/drivers/misc/aes-amd64.S linux-3.19-AES/drivers/misc/aes-amd64.S
--- linux-3.14-noloop/drivers/misc/aes-amd64.S 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/aes-amd64.S 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/aes-amd64.S 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/aes-amd64.S 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,897 @@ @@ -0,0 +1,897 @@
+// +//
+// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. +// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
@ -4308,9 +4309,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-amd64.S linux-3.14-AES/drivers/misc
+#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK) +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/aes-intel32.S linux-3.14-AES/drivers/misc/aes-intel32.S diff -urN linux-3.19-noloop/drivers/misc/aes-intel32.S linux-3.19-AES/drivers/misc/aes-intel32.S
--- linux-3.14-noloop/drivers/misc/aes-intel32.S 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/aes-intel32.S 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/aes-intel32.S 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/aes-intel32.S 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,655 @@ @@ -0,0 +1,655 @@
+/* +/*
+ * Implement AES algorithm in Intel AES-NI instructions. + * Implement AES algorithm in Intel AES-NI instructions.
@ -4967,9 +4968,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-intel32.S linux-3.14-AES/drivers/mi
+#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK) +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/aes-intel64.S linux-3.14-AES/drivers/misc/aes-intel64.S diff -urN linux-3.19-noloop/drivers/misc/aes-intel64.S linux-3.19-AES/drivers/misc/aes-intel64.S
--- linux-3.14-noloop/drivers/misc/aes-intel64.S 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/aes-intel64.S 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/aes-intel64.S 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/aes-intel64.S 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,649 @@ @@ -0,0 +1,649 @@
+/* +/*
+ * Implement AES algorithm in Intel AES-NI instructions. + * Implement AES algorithm in Intel AES-NI instructions.
@ -5620,9 +5621,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-intel64.S linux-3.14-AES/drivers/mi
+#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK) +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/aes-x86.S linux-3.14-AES/drivers/misc/aes-x86.S diff -urN linux-3.19-noloop/drivers/misc/aes-x86.S linux-3.19-AES/drivers/misc/aes-x86.S
--- linux-3.14-noloop/drivers/misc/aes-x86.S 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/aes-x86.S 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/aes-x86.S 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/aes-x86.S 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,927 @@ @@ -0,0 +1,927 @@
+// +//
+// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK. +// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
@ -6551,9 +6552,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-x86.S linux-3.14-AES/drivers/misc/a
+#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK) +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/aes.c linux-3.14-AES/drivers/misc/aes.c diff -urN linux-3.19-noloop/drivers/misc/aes.c linux-3.19-AES/drivers/misc/aes.c
--- linux-3.14-noloop/drivers/misc/aes.c 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/aes.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/aes.c 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/aes.c 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,1479 @@ @@ -0,0 +1,1479 @@
+// I retain copyright in this code but I encourage its free use provided +// I retain copyright in this code but I encourage its free use provided
+// that I don't carry any responsibility for the results. I am especially +// that I don't carry any responsibility for the results. I am especially
@ -8034,9 +8035,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes.c linux-3.14-AES/drivers/misc/aes.c
+ +
+ state_out(out_blk, b0); + state_out(out_blk, b0);
+} +}
diff -urN linux-3.14-noloop/drivers/misc/aes.h linux-3.14-AES/drivers/misc/aes.h diff -urN linux-3.19-noloop/drivers/misc/aes.h linux-3.19-AES/drivers/misc/aes.h
--- linux-3.14-noloop/drivers/misc/aes.h 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/aes.h 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/aes.h 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/aes.h 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,112 @@ @@ -0,0 +1,112 @@
+// I retain copyright in this code but I encourage its free use provided +// I retain copyright in this code but I encourage its free use provided
+// that I don't carry any responsibility for the results. I am especially +// that I don't carry any responsibility for the results. I am especially
@ -8150,9 +8151,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes.h linux-3.14-AES/drivers/misc/aes.h
+// if their parameters have not changed. +// if their parameters have not changed.
+ +
+#endif // _AES_H +#endif // _AES_H
diff -urN linux-3.14-noloop/drivers/misc/crypto-ksym.c linux-3.14-AES/drivers/misc/crypto-ksym.c diff -urN linux-3.19-noloop/drivers/misc/crypto-ksym.c linux-3.19-AES/drivers/misc/crypto-ksym.c
--- linux-3.14-noloop/drivers/misc/crypto-ksym.c 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/crypto-ksym.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/crypto-ksym.c 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/crypto-ksym.c 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+#include <linux/module.h> +#include <linux/module.h>
+#include "aes.h" +#include "aes.h"
@ -8172,9 +8173,9 @@ diff -urN linux-3.14-noloop/drivers/misc/crypto-ksym.c linux-3.14-AES/drivers/mi
+EXPORT_SYMBOL(intel_aes_cbc_decrypt); +EXPORT_SYMBOL(intel_aes_cbc_decrypt);
+EXPORT_SYMBOL(intel_aes_cbc_enc_4x512); +EXPORT_SYMBOL(intel_aes_cbc_enc_4x512);
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/md5-2x-amd64.S linux-3.14-AES/drivers/misc/md5-2x-amd64.S diff -urN linux-3.19-noloop/drivers/misc/md5-2x-amd64.S linux-3.19-AES/drivers/misc/md5-2x-amd64.S
--- linux-3.14-noloop/drivers/misc/md5-2x-amd64.S 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/md5-2x-amd64.S 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/md5-2x-amd64.S 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/md5-2x-amd64.S 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,223 @@ @@ -0,0 +1,223 @@
+// +//
+// md5-2x-amd64.S +// md5-2x-amd64.S
@ -8399,9 +8400,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5-2x-amd64.S linux-3.14-AES/drivers/m
+#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK) +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/md5-amd64.S linux-3.14-AES/drivers/misc/md5-amd64.S diff -urN linux-3.19-noloop/drivers/misc/md5-amd64.S linux-3.19-AES/drivers/misc/md5-amd64.S
--- linux-3.14-noloop/drivers/misc/md5-amd64.S 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/md5-amd64.S 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/md5-amd64.S 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/md5-amd64.S 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,204 @@ @@ -0,0 +1,204 @@
+// +//
+// md5-amd64.S +// md5-amd64.S
@ -8607,9 +8608,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5-amd64.S linux-3.14-AES/drivers/misc
+#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK) +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/md5-x86.S linux-3.14-AES/drivers/misc/md5-x86.S diff -urN linux-3.19-noloop/drivers/misc/md5-x86.S linux-3.19-AES/drivers/misc/md5-x86.S
--- linux-3.14-noloop/drivers/misc/md5-x86.S 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/md5-x86.S 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/md5-x86.S 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/md5-x86.S 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,211 @@ @@ -0,0 +1,211 @@
+// +//
+// md5-x86.S +// md5-x86.S
@ -8822,9 +8823,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5-x86.S linux-3.14-AES/drivers/misc/m
+#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK) +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
+ .section .note.GNU-stack,"",@progbits + .section .note.GNU-stack,"",@progbits
+#endif +#endif
diff -urN linux-3.14-noloop/drivers/misc/md5.c linux-3.14-AES/drivers/misc/md5.c diff -urN linux-3.19-noloop/drivers/misc/md5.c linux-3.19-AES/drivers/misc/md5.c
--- linux-3.14-noloop/drivers/misc/md5.c 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/md5.c 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/md5.c 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/md5.c 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
+/* +/*
+ * MD5 Message Digest Algorithm (RFC1321). + * MD5 Message Digest Algorithm (RFC1321).
@ -8932,9 +8933,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5.c linux-3.14-AES/drivers/misc/md5.c
+ hash[2] += c; + hash[2] += c;
+ hash[3] += d; + hash[3] += d;
+} +}
diff -urN linux-3.14-noloop/drivers/misc/md5.h linux-3.14-AES/drivers/misc/md5.h diff -urN linux-3.19-noloop/drivers/misc/md5.h linux-3.19-AES/drivers/misc/md5.h
--- linux-3.14-noloop/drivers/misc/md5.h 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/drivers/misc/md5.h 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/drivers/misc/md5.h 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/drivers/misc/md5.h 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+/* md5.h */ +/* md5.h */
+ +
@ -8951,9 +8952,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5.h linux-3.14-AES/drivers/misc/md5.h
+ asmlinkage + asmlinkage
+#endif +#endif
+extern void md5_transform_CPUbyteorder_2x(u_int32_t *, u_int32_t const *, u_int32_t const *); +extern void md5_transform_CPUbyteorder_2x(u_int32_t *, u_int32_t const *, u_int32_t const *);
diff -urN linux-3.14-noloop/include/linux/loop.h linux-3.14-AES/include/linux/loop.h diff -urN linux-3.19-noloop/include/linux/loop.h linux-3.19-AES/include/linux/loop.h
--- linux-3.14-noloop/include/linux/loop.h 1970-01-01 02:00:00.000000000 +0200 --- linux-3.19-noloop/include/linux/loop.h 1970-01-01 02:00:00.000000000 +0200
+++ linux-3.14-AES/include/linux/loop.h 2014-03-31 22:20:36.000000000 +0300 +++ linux-3.19-AES/include/linux/loop.h 2015-02-09 20:49:52.000000000 +0200
@@ -0,0 +1,171 @@ @@ -0,0 +1,171 @@
+#ifndef _LINUX_LOOP_H +#ifndef _LINUX_LOOP_H
+#define _LINUX_LOOP_H +#define _LINUX_LOOP_H