main/linux-vanilla: upgrade to 3.18.14

2 files changed, 4 insertions, 79 deletions

diff --git a/main/linux-vanilla/APKBUILD b/main/linux-vanilla/APKBUILD
index f25c33d73..fa9c21be4 100644
--- a/main/linux-vanilla/APKBUILD
+++ b/main/linux-vanilla/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vanilla
 pkgname=linux-${_flavor}
-pkgver=3.18.13
+pkgver=3.18.14
 case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
@@ -16,7 +16,6 @@ options="!strip"
 _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
-	fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
 
 	kernelconfig.armhf
 	kernelconfig.x86
@@ -162,20 +161,17 @@ dev() {
 }
 
 md5sums="9e854df51ca3fef8bfe566dbd7b89241  linux-3.18.tar.xz
-59d1fabcccea6a8a3fcf59d610205a6e  fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
 60efa66cae174e7689220f940862b2d8  kernelconfig.armhf
 c901b226acb933420d3fc065ced7edc5  kernelconfig.x86
 6a8535780a6bfd4c49273ffb923fff06  kernelconfig.x86_64
-1fab44780052ccc19f103468d7c23284  patch-3.18.13.xz"
+92994dfdfd9787db3c0f845c3bc18e51  patch-3.18.14.xz"
 sha256sums="becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd  linux-3.18.tar.xz
-e1377ef692929a37f1e638038b10e06a98502f28efc461e1948dcd67df1e7619  fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
 236a0c28dd9a354bb9aad1686a71e017c61863514669811dc86a71d55c400bc9  kernelconfig.armhf
 c174ae130cd9e21e1d7d32f2bf53e8e847777e4230ba800d9585018bd25f7f9e  kernelconfig.x86
 98f05fa2f66bb50a409f445ab620662ee12366e5c06fae71121d8c8610718b7f  kernelconfig.x86_64
-d9191eb7fa47e95c81945e561cdf35bb12fcdd2bbf12f37f60533cbf57be429c  patch-3.18.13.xz"
+488ac8f9fb1bcc5670d2222a4f382ca4e4950c4489bc5217c244b787d2ac8974  patch-3.18.14.xz"
 sha512sums="2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009  linux-3.18.tar.xz
-e8b5a96ddcf55ac9df7de506728a5308f9156086410edf6d354d7c69f6fb450222b25eb062e397889eeb9e5653c3f5110b0603003cca5d6706171b5559ddcd97  fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
 2e8c35d6d7c88a8742dd3ccc62e45584ca634847d21a712325092d607b96ab417377864baa559c4ad1e5041e591e8938d40a41c4ece8a52ac916a97ae57f7347  kernelconfig.armhf
 4f5ebd4739e9c84ab3a1633df5180248f937f4a7147cf1b40e30806cb7455305acb9e85dff01f6352bf6d7ee54ccc11e3f5ed59a9114681a8fc06aa0438d8175  kernelconfig.x86
 060d69eec9ec07a6f468a4545730893509c3893cd3247ac770bfe486f17fe1b6c3d20118aea8dd42ad1506e0500208bf7ca1e4d4108bd8e661cd2ca39d0496f2  kernelconfig.x86_64
-4d85a6a64b2d07b94b817fd4c3e0406910dd7d2028e58cfb13cf04d9ebb3bfe0f99148742489e2d5a72d93018c85adbf0e37bd068c01084d305574a9c49f9dff  patch-3.18.13.xz"
+ba898f08a0252f3bc99b4bb3916dfd6af1935bf6d149a9204b834a16ec615a5f0f53e73c14075c40efd8a8f5cf64b9f1b7dc3e74fb5f5fab87d7b0c6b0517315  patch-3.18.14.xz"
diff --git a/main/linux-vanilla/fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch b/main/linux-vanilla/fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
deleted file mode 100644
index 71e4dce99..000000000
--- a/main/linux-vanilla/fs-binfmt_elf-fix-memory-map-for-PIE-applications.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 9bfe85ecddfd1a11376e7b4916f9b000aabd5da6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Tue, 1 Oct 2013 13:46:04 +0300
-Subject: [PATCH] fs/binfmt_elf: fix memory map for PIE applications
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-arch/x86/include/asm/elf.h comment says:
-"
-ELF_ET_DYN_BASE is the location that an ET_DYN program is loaded
-if exec'ed.  Typical use of this is to invoke "./ld.so someprog"
-to test out a new version of the loader.  We need to make sure
-that it is out of the way of the program that it will "exec",
-and that there is sufficient room for the brk.
-"
-
-In case we have main application linked as PIE, this will cause
-problems as the main program itself will go the memory location
-that allows very little heap.
-
-This fixes the loader to detect PIE application by checking if
-elf_interpreter is requested, and loads them to beginning of the
-address space instead of the specially crafted place for elf
-interpreter.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- fs/binfmt_elf.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 100edcc..1161e5d 100644
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -802,6 +802,10 @@ static int load_elf_binary(struct linux_binprm *bprm)
- 			 * default mmap base, as well as whatever program they
- 			 * might try to exec.  This is because the brk will
- 			 * follow the loader, and is not movable.  */
-+			if (elf_interpreter)
-+				load_bias = 0x00400000UL;
-+			else
-+				load_bias = ELF_ET_DYN_BASE;
- #ifdef CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE
- 			/* Memory randomization might have been switched off
- 			 * in runtime via sysctl or explicit setting of
-@@ -810,13 +814,14 @@ static int load_elf_binary(struct linux_binprm *bprm)
- 			 * load_bias value in order to establish proper
- 			 * non-randomized mappings.
- 			 */
--			if (current->flags & PF_RANDOMIZE)
--				load_bias = 0;
--			else
--				load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
--#else
--			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
-+			if (current->flags & PF_RANDOMIZE) {
-+				if (elf_interpreter)
-+					load_bias += (get_random_int() & STACK_RND_MASK) << PAGE_SHIFT;
-+				else
-+					load_bias = 0;
-+			}
- #endif
-+			load_bias = ELF_PAGESTART(vaddr + load_bias);
- 		}
- 
- 		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
--- 
-1.8.4
-
-