From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 703C9138CCE for ; Sun, 29 Mar 2015 00:01:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 794D7E0884; Sun, 29 Mar 2015 00:01:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 142F0E0884 for ; Sun, 29 Mar 2015 00:01:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7C28340AFD for ; Sun, 29 Mar 2015 00:01:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24B5214BCD for ; Sun, 29 Mar 2015 00:01:18 +0000 (UTC) From: "Devan Franchini" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" Message-ID: <1427587238.0e6afac1629725f895f15a48348956c966bcb6ab.twitch153@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/configs/ X-VCS-Repository: proj/releng X-VCS-Files: tools-hardened/desktop/configs/loop-AES-kernel.patch X-VCS-Directories: tools-hardened/desktop/configs/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 0e6afac1629725f895f15a48348956c966bcb6ab X-VCS-Branch: master Date: Sun, 29 Mar 2015 00:01:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 286df8bf-1d61-47e4-95b2-7a0b663fb916 X-Archives-Hash: 0248897d2c6554a41e68d6b676759888 commit: 0e6afac1629725f895f15a48348956c966bcb6ab Author: Devan Franchini gentoo org> AuthorDate: Sun Mar 29 00:00:38 2015 +0000 Commit: Devan Franchini gentoo org> CommitDate: Sun Mar 29 00:00:38 2015 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0e6afac1 tools-hardened/desktop loop-AES-kernel.patch: Updates to kernel 3.19 compliant patch .../desktop/configs/loop-AES-kernel.patch | 101 +++++++++++---------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/tools-hardened/desktop/configs/loop-AES-kernel.patch b/tools-hardened/desktop/configs/loop-AES-kernel.patch index bcc2b69..76596b1 100644 --- a/tools-hardened/desktop/configs/loop-AES-kernel.patch +++ b/tools-hardened/desktop/configs/loop-AES-kernel.patch @@ -3,9 +3,9 @@ include/linux/loop.h source files must be removed: 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 ---- linux-3.14-noloop/drivers/block/Kconfig 2014-03-31 06:40:15.000000000 +0300 -+++ linux-3.14-AES/drivers/block/Kconfig 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/block/Kconfig linux-3.19-AES/drivers/block/Kconfig +--- linux-3.19-noloop/drivers/block/Kconfig 2015-02-09 04:54:22.000000000 +0200 ++++ linux-3.19-AES/drivers/block/Kconfig 2015-02-09 20:49:52.000000000 +0200 @@ -235,14 +235,6 @@ bits of, say, a sound file). This is also safe if the file resides 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" -diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/loop.c ---- linux-3.14-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 -@@ -0,0 +1,3278 @@ +diff -urN linux-3.19-noloop/drivers/block/loop.c linux-3.19-AES/drivers/block/loop.c +--- linux-3.19-noloop/drivers/block/loop.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/block/loop.c 2015-02-09 20:49:52.000000000 +0200 +@@ -0,0 +1,3279 @@ +/* + * 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_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1); + 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; + blk_queue_flush(lo->lo_queue, 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); + + 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)); + lo->lo_queue->limits.io_min = q->limits.io_min; + 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); +#endif -diff -urN linux-3.14-noloop/drivers/misc/Makefile linux-3.14-AES/drivers/misc/Makefile ---- linux-3.14-noloop/drivers/misc/Makefile 2014-03-31 06:40:15.000000000 +0300 -+++ linux-3.14-AES/drivers/misc/Makefile 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/Makefile linux-3.19-AES/drivers/misc/Makefile +--- linux-3.19-noloop/drivers/misc/Makefile 2015-02-09 04:54:22.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/Makefile 2015-02-09 20:49:52.000000000 +0200 @@ -2,6 +2,33 @@ # 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_AD525X_DPOT) += ad525x_dpot.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 ---- linux-3.14-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 +diff -urN linux-3.19-noloop/drivers/misc/aes-amd64.S linux-3.19-AES/drivers/misc/aes-amd64.S +--- linux-3.19-noloop/drivers/misc/aes-amd64.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/aes-amd64.S 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,897 @@ +// +// Copyright (c) 2001, Dr Brian Gladman , 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) + .section .note.GNU-stack,"",@progbits +#endif -diff -urN linux-3.14-noloop/drivers/misc/aes-intel32.S linux-3.14-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.14-AES/drivers/misc/aes-intel32.S 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/aes-intel32.S linux-3.19-AES/drivers/misc/aes-intel32.S +--- linux-3.19-noloop/drivers/misc/aes-intel32.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/aes-intel32.S 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,655 @@ +/* + * 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) + .section .note.GNU-stack,"",@progbits +#endif -diff -urN linux-3.14-noloop/drivers/misc/aes-intel64.S linux-3.14-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.14-AES/drivers/misc/aes-intel64.S 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/aes-intel64.S linux-3.19-AES/drivers/misc/aes-intel64.S +--- linux-3.19-noloop/drivers/misc/aes-intel64.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/aes-intel64.S 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,649 @@ +/* + * 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) + .section .note.GNU-stack,"",@progbits +#endif -diff -urN linux-3.14-noloop/drivers/misc/aes-x86.S linux-3.14-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.14-AES/drivers/misc/aes-x86.S 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/aes-x86.S linux-3.19-AES/drivers/misc/aes-x86.S +--- linux-3.19-noloop/drivers/misc/aes-x86.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/aes-x86.S 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,927 @@ +// +// Copyright (c) 2001, Dr Brian Gladman , 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) + .section .note.GNU-stack,"",@progbits +#endif -diff -urN linux-3.14-noloop/drivers/misc/aes.c linux-3.14-AES/drivers/misc/aes.c ---- linux-3.14-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 +diff -urN linux-3.19-noloop/drivers/misc/aes.c linux-3.19-AES/drivers/misc/aes.c +--- linux-3.19-noloop/drivers/misc/aes.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/aes.c 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,1479 @@ +// 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 @@ -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); +} -diff -urN linux-3.14-noloop/drivers/misc/aes.h linux-3.14-AES/drivers/misc/aes.h ---- linux-3.14-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 +diff -urN linux-3.19-noloop/drivers/misc/aes.h linux-3.19-AES/drivers/misc/aes.h +--- linux-3.19-noloop/drivers/misc/aes.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/aes.h 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,112 @@ +// 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 @@ -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. + +#endif // _AES_H -diff -urN linux-3.14-noloop/drivers/misc/crypto-ksym.c linux-3.14-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.14-AES/drivers/misc/crypto-ksym.c 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/crypto-ksym.c linux-3.19-AES/drivers/misc/crypto-ksym.c +--- linux-3.19-noloop/drivers/misc/crypto-ksym.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/crypto-ksym.c 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,18 @@ +#include +#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_enc_4x512); +#endif -diff -urN linux-3.14-noloop/drivers/misc/md5-2x-amd64.S linux-3.14-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.14-AES/drivers/misc/md5-2x-amd64.S 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/md5-2x-amd64.S linux-3.19-AES/drivers/misc/md5-2x-amd64.S +--- linux-3.19-noloop/drivers/misc/md5-2x-amd64.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/md5-2x-amd64.S 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,223 @@ +// +// 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) + .section .note.GNU-stack,"",@progbits +#endif -diff -urN linux-3.14-noloop/drivers/misc/md5-amd64.S linux-3.14-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.14-AES/drivers/misc/md5-amd64.S 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/md5-amd64.S linux-3.19-AES/drivers/misc/md5-amd64.S +--- linux-3.19-noloop/drivers/misc/md5-amd64.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/md5-amd64.S 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,204 @@ +// +// 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) + .section .note.GNU-stack,"",@progbits +#endif -diff -urN linux-3.14-noloop/drivers/misc/md5-x86.S linux-3.14-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.14-AES/drivers/misc/md5-x86.S 2014-03-31 22:20:36.000000000 +0300 +diff -urN linux-3.19-noloop/drivers/misc/md5-x86.S linux-3.19-AES/drivers/misc/md5-x86.S +--- linux-3.19-noloop/drivers/misc/md5-x86.S 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/md5-x86.S 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,211 @@ +// +// 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) + .section .note.GNU-stack,"",@progbits +#endif -diff -urN linux-3.14-noloop/drivers/misc/md5.c linux-3.14-AES/drivers/misc/md5.c ---- linux-3.14-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 +diff -urN linux-3.19-noloop/drivers/misc/md5.c linux-3.19-AES/drivers/misc/md5.c +--- linux-3.19-noloop/drivers/misc/md5.c 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/md5.c 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,106 @@ +/* + * 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[3] += d; +} -diff -urN linux-3.14-noloop/drivers/misc/md5.h linux-3.14-AES/drivers/misc/md5.h ---- linux-3.14-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 +diff -urN linux-3.19-noloop/drivers/misc/md5.h linux-3.19-AES/drivers/misc/md5.h +--- linux-3.19-noloop/drivers/misc/md5.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/drivers/misc/md5.h 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,15 @@ +/* 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 +#endif +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 ---- linux-3.14-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 +diff -urN linux-3.19-noloop/include/linux/loop.h linux-3.19-AES/include/linux/loop.h +--- linux-3.19-noloop/include/linux/loop.h 1970-01-01 02:00:00.000000000 +0200 ++++ linux-3.19-AES/include/linux/loop.h 2015-02-09 20:49:52.000000000 +0200 @@ -0,0 +1,171 @@ +#ifndef _LINUX_LOOP_H +#define _LINUX_LOOP_H