diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-21 07:27:12 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-23 12:59:09 +0000 |
commit | 4cee076869205e9cd7c2b35f85e9198bdf81c876 (patch) | |
tree | e61dee234cbf48ceef9ed030bbb725d0cad70730 | |
parent | d8ee0dcb189dc816442cce665f855cbf0d1c5821 (diff) | |
download | alpine_aports-4cee076869205e9cd7c2b35f85e9198bdf81c876.tar.bz2 alpine_aports-4cee076869205e9cd7c2b35f85e9198bdf81c876.tar.xz alpine_aports-4cee076869205e9cd7c2b35f85e9198bdf81c876.zip |
main/linux-gsrec: upgrade to 3.10.17
(cherry picked from commit 32ea910f77a26b6f746215c082d4859d24ec4251)
-rw-r--r-- | main/linux-grsec/APKBUILD | 14 | ||||
-rw-r--r-- | main/linux-grsec/grsecurity-2.9.1-3.10.17-unofficial.patch (renamed from main/linux-grsec/grsecurity-2.9.1-3.10.16-unofficial.patch) | 113 |
2 files changed, 60 insertions, 67 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 52ace5b059..67f3b9747f 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | _flavor=grsec | 3 | _flavor=grsec |
4 | pkgname=linux-${_flavor} | 4 | pkgname=linux-${_flavor} |
5 | pkgver=3.10.16 | 5 | pkgver=3.10.17 |
6 | case $pkgver in | 6 | case $pkgver in |
7 | *.*.*) _kernver=${pkgver%.*};; | 7 | *.*.*) _kernver=${pkgver%.*};; |
8 | *.*) _kernver=${pkgver};; | 8 | *.*) _kernver=${pkgver};; |
@@ -150,8 +150,8 @@ dev() { | |||
150 | } | 150 | } |
151 | 151 | ||
152 | md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz | 152 | md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz |
153 | 029a48f796bcf8c36fad09cfe689be5a patch-3.10.16.xz | 153 | 8431ee4e2467fdfde47e31701813a265 patch-3.10.17.xz |
154 | b2c8994b3b2fa2a2da739f8c78d60fee grsecurity-2.9.1-3.10.16-unofficial.patch | 154 | 6894537e9ccc2b296b27b42c39c64b31 grsecurity-2.9.1-3.10.17-unofficial.patch |
155 | a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch | 155 | a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch |
156 | 656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch | 156 | 656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch |
157 | aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch | 157 | aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch |
@@ -162,8 +162,8 @@ c6a4ae7e8ca6159e1631545515805216 fix-memory-map-for-PIE-applications.patch | |||
162 | 866e6c4daed45d563829804f8ad50ed9 kernelconfig.x86 | 162 | 866e6c4daed45d563829804f8ad50ed9 kernelconfig.x86 |
163 | 272aaddd0a19a5052208bc25551995a3 kernelconfig.x86_64" | 163 | 272aaddd0a19a5052208bc25551995a3 kernelconfig.x86_64" |
164 | sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz | 164 | sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz |
165 | 115e02fe0a38eefdb1e4b1fa5e5878cb6b007db08e18901c2c4fb20a279790f4 patch-3.10.16.xz | 165 | 5552fc6f24a56d13d603ddc7759114a7b52e92ad2fb84a23a1b80b37b739a33b patch-3.10.17.xz |
166 | 89beaae3759cc53a3b061e48bbcdfaf53d7333959c6a22090aaf40eaf540e2e0 grsecurity-2.9.1-3.10.16-unofficial.patch | 166 | 8e82e71c0da392a601a952aa712b56a5116fcf626c19d69ae9d86dda2d200852 grsecurity-2.9.1-3.10.17-unofficial.patch |
167 | 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch | 167 | 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch |
168 | dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch | 168 | dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch |
169 | 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch | 169 | 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch |
@@ -174,8 +174,8 @@ fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e 0006-ipv4-use- | |||
174 | 7fd28634998ef1fddafed5f2516e902924245d2464b9e86476bfaa55ccfc3bc3 kernelconfig.x86 | 174 | 7fd28634998ef1fddafed5f2516e902924245d2464b9e86476bfaa55ccfc3bc3 kernelconfig.x86 |
175 | f2843ae4f9b3e3c27f3138ce4b740c2803bdab0c7a910c662d951843803b9554 kernelconfig.x86_64" | 175 | f2843ae4f9b3e3c27f3138ce4b740c2803bdab0c7a910c662d951843803b9554 kernelconfig.x86_64" |
176 | sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz | 176 | sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz |
177 | 34cf05008f8992b7cd4d4f34b13a6a55df75ce53328eef10119069f5b60e89fce18d786bdf47ed60083535917e8113a4b0da66530b9b783cfef271b433c0f58b patch-3.10.16.xz | 177 | 38f9085d67d59cb37c32db69b84714a96f327fe74b69bb4a7304861ea6e474614216067ee08093f41739ce803b83a70400c83f06c695cb1114cf41c0b2dc7aa7 patch-3.10.17.xz |
178 | 474ea9a25e1356772b079db354108dd14755853f89003996af0482a1a21b83a6e592167a7e4e456afd33d4bddef5f2165f38c0e5b2ec5c0a2dec53a8ebd7c6e9 grsecurity-2.9.1-3.10.16-unofficial.patch | 178 | 6d27a986f32f42b12c4291ebb4b7365d8cd90b604ee9bc57344b9f9764efd7c5aae89c5ab4977878a24ae4b6e812c1db6030c3451bd15fdb2ea01a2a50e2ce41 grsecurity-2.9.1-3.10.17-unofficial.patch |
179 | 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch | 179 | 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch |
180 | 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch | 180 | 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch |
181 | 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch | 181 | 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch |
diff --git a/main/linux-grsec/grsecurity-2.9.1-3.10.16-unofficial.patch b/main/linux-grsec/grsecurity-2.9.1-3.10.17-unofficial.patch index e11ab9abf4..3a78478212 100644 --- a/main/linux-grsec/grsecurity-2.9.1-3.10.16-unofficial.patch +++ b/main/linux-grsec/grsecurity-2.9.1-3.10.17-unofficial.patch | |||
@@ -281,7 +281,7 @@ index 2fe6e76..889ee23 100644 | |||
281 | 281 | ||
282 | pcd. [PARIDE] | 282 | pcd. [PARIDE] |
283 | diff --git a/Makefile b/Makefile | 283 | diff --git a/Makefile b/Makefile |
284 | index e9528d2..0c2aa58 100644 | 284 | index 5c7d3d6..aa1c9c3 100644 |
285 | --- a/Makefile | 285 | --- a/Makefile |
286 | +++ b/Makefile | 286 | +++ b/Makefile |
287 | @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ | 287 | @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ |
@@ -2890,7 +2890,7 @@ index 1f2740e..b36e225 100644 | |||
2890 | }; | 2890 | }; |
2891 | 2891 | ||
2892 | diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c | 2892 | diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c |
2893 | index 5bc2615..dcd439f 100644 | 2893 | index ab1fe3b..dcd439f 100644 |
2894 | --- a/arch/arm/kernel/process.c | 2894 | --- a/arch/arm/kernel/process.c |
2895 | +++ b/arch/arm/kernel/process.c | 2895 | +++ b/arch/arm/kernel/process.c |
2896 | @@ -223,6 +223,7 @@ void machine_power_off(void) | 2896 | @@ -223,6 +223,7 @@ void machine_power_off(void) |
@@ -2943,15 +2943,7 @@ index 5bc2615..dcd439f 100644 | |||
2943 | return 0; | 2943 | return 0; |
2944 | } | 2944 | } |
2945 | arch_initcall(gate_vma_init); | 2945 | arch_initcall(gate_vma_init); |
2946 | @@ -466,48 +461,23 @@ int in_gate_area_no_mm(unsigned long addr) | 2946 | @@ -473,41 +468,16 @@ int in_gate_area_no_mm(unsigned long addr) |
2947 | { | ||
2948 | return in_gate_area(NULL, addr); | ||
2949 | } | ||
2950 | -#define is_gate_vma(vma) ((vma) = &gate_vma) | ||
2951 | +#define is_gate_vma(vma) ((vma) == &gate_vma) | ||
2952 | #else | ||
2953 | #define is_gate_vma(vma) 0 | ||
2954 | #endif | ||
2955 | 2947 | ||
2956 | const char *arch_vma_name(struct vm_area_struct *vma) | 2948 | const char *arch_vma_name(struct vm_area_struct *vma) |
2957 | { | 2949 | { |
@@ -7347,7 +7339,7 @@ index 5dfd248..64914ac 100644 | |||
7347 | return addr; | 7339 | return addr; |
7348 | } | 7340 | } |
7349 | diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c | 7341 | diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c |
7350 | index 04e47c6..7a8faf6 100644 | 7342 | index b3f87a3..5d5d03d 100644 |
7351 | --- a/arch/parisc/kernel/traps.c | 7343 | --- a/arch/parisc/kernel/traps.c |
7352 | +++ b/arch/parisc/kernel/traps.c | 7344 | +++ b/arch/parisc/kernel/traps.c |
7353 | @@ -727,9 +727,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | 7345 | @@ -727,9 +727,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) |
@@ -15171,7 +15163,7 @@ index 59c6c40..5e0b22c 100644 | |||
15171 | struct compat_timespec { | 15163 | struct compat_timespec { |
15172 | compat_time_t tv_sec; | 15164 | compat_time_t tv_sec; |
15173 | diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h | 15165 | diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h |
15174 | index e99ac27..10d834e 100644 | 15166 | index 4af181d..eb8011f 100644 |
15175 | --- a/arch/x86/include/asm/cpufeature.h | 15167 | --- a/arch/x86/include/asm/cpufeature.h |
15176 | +++ b/arch/x86/include/asm/cpufeature.h | 15168 | +++ b/arch/x86/include/asm/cpufeature.h |
15177 | @@ -203,7 +203,7 @@ | 15169 | @@ -203,7 +203,7 @@ |
@@ -20774,10 +20766,10 @@ index addb207..99635fa 100644 | |||
20774 | +EXPORT_SYMBOL(pax_check_alloca); | 20766 | +EXPORT_SYMBOL(pax_check_alloca); |
20775 | +#endif | 20767 | +#endif |
20776 | diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c | 20768 | diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c |
20777 | index d32abea..74daf4f 100644 | 20769 | index 174da5f..5e55606 100644 |
20778 | --- a/arch/x86/kernel/e820.c | 20770 | --- a/arch/x86/kernel/e820.c |
20779 | +++ b/arch/x86/kernel/e820.c | 20771 | +++ b/arch/x86/kernel/e820.c |
20780 | @@ -800,8 +800,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void) | 20772 | @@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void) |
20781 | 20773 | ||
20782 | static void early_panic(char *msg) | 20774 | static void early_panic(char *msg) |
20783 | { | 20775 | { |
@@ -25364,7 +25356,7 @@ index f2bb9c9..bed145d7 100644 | |||
25364 | 25356 | ||
25365 | 1: | 25357 | 1: |
25366 | diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c | 25358 | diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c |
25367 | index 56f7fcf..2cfe4f1 100644 | 25359 | index 91964c6..bbab1da 100644 |
25368 | --- a/arch/x86/kernel/setup.c | 25360 | --- a/arch/x86/kernel/setup.c |
25369 | +++ b/arch/x86/kernel/setup.c | 25361 | +++ b/arch/x86/kernel/setup.c |
25370 | @@ -110,6 +110,7 @@ | 25362 | @@ -110,6 +110,7 @@ |
@@ -25429,16 +25421,16 @@ index 56f7fcf..2cfe4f1 100644 | |||
25429 | /* Boot loader ID and version as integers, for the benefit of proc_dointvec */ | 25421 | /* Boot loader ID and version as integers, for the benefit of proc_dointvec */ |
25430 | int bootloader_type, bootloader_version; | 25422 | int bootloader_type, bootloader_version; |
25431 | 25423 | ||
25432 | @@ -444,7 +483,7 @@ static void __init parse_setup_data(void) | 25424 | @@ -442,7 +481,7 @@ static void __init parse_setup_data(void) |
25433 | 25425 | ||
25434 | switch (data->type) { | 25426 | switch (data_type) { |
25435 | case SETUP_E820_EXT: | 25427 | case SETUP_E820_EXT: |
25436 | - parse_e820_ext(data); | 25428 | - parse_e820_ext(pa_data, data_len); |
25437 | + parse_e820_ext((struct setup_data __force_kernel *)data); | 25429 | + parse_e820_ext((struct setup_data __force_kernel *)pa_data, data_len); |
25438 | break; | 25430 | break; |
25439 | case SETUP_DTB: | 25431 | case SETUP_DTB: |
25440 | add_dtb(pa_data); | 25432 | add_dtb(pa_data); |
25441 | @@ -771,7 +810,7 @@ static void __init trim_bios_range(void) | 25433 | @@ -768,7 +807,7 @@ static void __init trim_bios_range(void) |
25442 | * area (640->1Mb) as ram even though it is not. | 25434 | * area (640->1Mb) as ram even though it is not. |
25443 | * take them out. | 25435 | * take them out. |
25444 | */ | 25436 | */ |
@@ -25447,7 +25439,7 @@ index 56f7fcf..2cfe4f1 100644 | |||
25447 | 25439 | ||
25448 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); | 25440 | sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); |
25449 | } | 25441 | } |
25450 | @@ -779,7 +818,7 @@ static void __init trim_bios_range(void) | 25442 | @@ -776,7 +815,7 @@ static void __init trim_bios_range(void) |
25451 | /* called before trim_bios_range() to spare extra sanitize */ | 25443 | /* called before trim_bios_range() to spare extra sanitize */ |
25452 | static void __init e820_add_kernel_range(void) | 25444 | static void __init e820_add_kernel_range(void) |
25453 | { | 25445 | { |
@@ -25456,7 +25448,7 @@ index 56f7fcf..2cfe4f1 100644 | |||
25456 | u64 size = __pa_symbol(_end) - start; | 25448 | u64 size = __pa_symbol(_end) - start; |
25457 | 25449 | ||
25458 | /* | 25450 | /* |
25459 | @@ -841,8 +880,12 @@ static void __init trim_low_memory_range(void) | 25451 | @@ -838,8 +877,12 @@ static void __init trim_low_memory_range(void) |
25460 | 25452 | ||
25461 | void __init setup_arch(char **cmdline_p) | 25453 | void __init setup_arch(char **cmdline_p) |
25462 | { | 25454 | { |
@@ -25469,7 +25461,7 @@ index 56f7fcf..2cfe4f1 100644 | |||
25469 | 25461 | ||
25470 | early_reserve_initrd(); | 25462 | early_reserve_initrd(); |
25471 | 25463 | ||
25472 | @@ -934,14 +977,14 @@ void __init setup_arch(char **cmdline_p) | 25464 | @@ -931,14 +974,14 @@ void __init setup_arch(char **cmdline_p) |
25473 | 25465 | ||
25474 | if (!boot_params.hdr.root_flags) | 25466 | if (!boot_params.hdr.root_flags) |
25475 | root_mountflags &= ~MS_RDONLY; | 25467 | root_mountflags &= ~MS_RDONLY; |
@@ -37374,7 +37366,7 @@ index 5c5cc00..ac9edb7 100644 | |||
37374 | 37366 | ||
37375 | if (cmd != SIOCWANDEV) | 37367 | if (cmd != SIOCWANDEV) |
37376 | diff --git a/drivers/char/random.c b/drivers/char/random.c | 37368 | diff --git a/drivers/char/random.c b/drivers/char/random.c |
37377 | index 35487e8..dac8bd1 100644 | 37369 | index 81eefa1..219a156 100644 |
37378 | --- a/drivers/char/random.c | 37370 | --- a/drivers/char/random.c |
37379 | +++ b/drivers/char/random.c | 37371 | +++ b/drivers/char/random.c |
37380 | @@ -272,8 +272,13 @@ | 37372 | @@ -272,8 +272,13 @@ |
@@ -39012,10 +39004,10 @@ index c8d16a6..ca71b5e 100644 | |||
39012 | iir = I915_READ(IIR); | 39004 | iir = I915_READ(IIR); |
39013 | 39005 | ||
39014 | diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c | 39006 | diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
39015 | index 2667d6d..410dc80 100644 | 39007 | index ab95259..8898d43 100644 |
39016 | --- a/drivers/gpu/drm/i915/intel_display.c | 39008 | --- a/drivers/gpu/drm/i915/intel_display.c |
39017 | +++ b/drivers/gpu/drm/i915/intel_display.c | 39009 | +++ b/drivers/gpu/drm/i915/intel_display.c |
39018 | @@ -8939,13 +8939,13 @@ struct intel_quirk { | 39010 | @@ -8935,13 +8935,13 @@ struct intel_quirk { |
39019 | int subsystem_vendor; | 39011 | int subsystem_vendor; |
39020 | int subsystem_device; | 39012 | int subsystem_device; |
39021 | void (*hook)(struct drm_device *dev); | 39013 | void (*hook)(struct drm_device *dev); |
@@ -39031,7 +39023,7 @@ index 2667d6d..410dc80 100644 | |||
39031 | 39023 | ||
39032 | static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) | 39024 | static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) |
39033 | { | 39025 | { |
39034 | @@ -8953,18 +8953,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) | 39026 | @@ -8949,18 +8949,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id) |
39035 | return 1; | 39027 | return 1; |
39036 | } | 39028 | } |
39037 | 39029 | ||
@@ -40196,10 +40188,10 @@ index 6351aba..dc4aaf4 100644 | |||
40196 | int res = 0; | 40188 | int res = 0; |
40197 | 40189 | ||
40198 | diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c | 40190 | diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c |
40199 | index 98814d1..9435d05 100644 | 40191 | index 3288f13..71cfb4e 100644 |
40200 | --- a/drivers/hwmon/applesmc.c | 40192 | --- a/drivers/hwmon/applesmc.c |
40201 | +++ b/drivers/hwmon/applesmc.c | 40193 | +++ b/drivers/hwmon/applesmc.c |
40202 | @@ -1093,7 +1093,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num) | 40194 | @@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num) |
40203 | { | 40195 | { |
40204 | struct applesmc_node_group *grp; | 40196 | struct applesmc_node_group *grp; |
40205 | struct applesmc_dev_attr *node; | 40197 | struct applesmc_dev_attr *node; |
@@ -54960,10 +54952,10 @@ index dafafba..10b3b27 100644 | |||
54960 | EXPORT_SYMBOL(dump_write); | 54952 | EXPORT_SYMBOL(dump_write); |
54961 | 54953 | ||
54962 | diff --git a/fs/dcache.c b/fs/dcache.c | 54954 | diff --git a/fs/dcache.c b/fs/dcache.c |
54963 | index f09b908..04b9690 100644 | 54955 | index da89cdf..5347dba 100644 |
54964 | --- a/fs/dcache.c | 54956 | --- a/fs/dcache.c |
54965 | +++ b/fs/dcache.c | 54957 | +++ b/fs/dcache.c |
54966 | @@ -3086,7 +3086,8 @@ void __init vfs_caches_init(unsigned long mempages) | 54958 | @@ -3097,7 +3097,8 @@ void __init vfs_caches_init(unsigned long mempages) |
54967 | mempages -= reserve; | 54959 | mempages -= reserve; |
54968 | 54960 | ||
54969 | names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, | 54961 | names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0, |
@@ -57719,7 +57711,7 @@ index 62b484e..0f9a140 100644 | |||
57719 | kfree(s); | 57711 | kfree(s); |
57720 | } | 57712 | } |
57721 | diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c | 57713 | diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c |
57722 | index a3f868a..bb308ae 100644 | 57714 | index 4e5f332..3cb6350 100644 |
57723 | --- a/fs/hugetlbfs/inode.c | 57715 | --- a/fs/hugetlbfs/inode.c |
57724 | +++ b/fs/hugetlbfs/inode.c | 57716 | +++ b/fs/hugetlbfs/inode.c |
57725 | @@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | 57717 | @@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, |
@@ -73222,7 +73214,7 @@ index ec1aee4..1077986 100644 | |||
73222 | asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t); | 73214 | asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t); |
73223 | /* | 73215 | /* |
73224 | diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h | 73216 | diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h |
73225 | index 842de22..7f3a41f 100644 | 73217 | index ded4299..da50e3b 100644 |
73226 | --- a/include/linux/compiler-gcc4.h | 73218 | --- a/include/linux/compiler-gcc4.h |
73227 | +++ b/include/linux/compiler-gcc4.h | 73219 | +++ b/include/linux/compiler-gcc4.h |
73228 | @@ -39,9 +39,29 @@ | 73220 | @@ -39,9 +39,29 @@ |
@@ -76796,10 +76788,10 @@ index 34a1e10..03a6d03 100644 | |||
76796 | struct proc_ns { | 76788 | struct proc_ns { |
76797 | void *ns; | 76789 | void *ns; |
76798 | diff --git a/include/linux/random.h b/include/linux/random.h | 76790 | diff --git a/include/linux/random.h b/include/linux/random.h |
76799 | index 3b9377d..61b506a 100644 | 76791 | index 6312dd9..f67904d 100644 |
76800 | --- a/include/linux/random.h | 76792 | --- a/include/linux/random.h |
76801 | +++ b/include/linux/random.h | 76793 | +++ b/include/linux/random.h |
76802 | @@ -32,6 +32,11 @@ void prandom_seed(u32 seed); | 76794 | @@ -33,6 +33,11 @@ void prandom_seed(u32 seed); |
76803 | u32 prandom_u32_state(struct rnd_state *); | 76795 | u32 prandom_u32_state(struct rnd_state *); |
76804 | void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes); | 76796 | void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes); |
76805 | 76797 | ||
@@ -79832,10 +79824,10 @@ index a67ef9d..2d17ed9 100644 | |||
79832 | #ifdef CONFIG_BLK_DEV_RAM | 79824 | #ifdef CONFIG_BLK_DEV_RAM |
79833 | int fd; | 79825 | int fd; |
79834 | diff --git a/init/main.c b/init/main.c | 79826 | diff --git a/init/main.c b/init/main.c |
79835 | index 9484f4b..0eac7c3 100644 | 79827 | index e83ac04..ddd6ed5 100644 |
79836 | --- a/init/main.c | 79828 | --- a/init/main.c |
79837 | +++ b/init/main.c | 79829 | +++ b/init/main.c |
79838 | @@ -100,6 +100,8 @@ static inline void mark_rodata_ro(void) { } | 79830 | @@ -101,6 +101,8 @@ static inline void mark_rodata_ro(void) { } |
79839 | extern void tc_init(void); | 79831 | extern void tc_init(void); |
79840 | #endif | 79832 | #endif |
79841 | 79833 | ||
@@ -79844,7 +79836,7 @@ index 9484f4b..0eac7c3 100644 | |||
79844 | /* | 79836 | /* |
79845 | * Debug helper: via this flag we know that we are in 'early bootup code' | 79837 | * Debug helper: via this flag we know that we are in 'early bootup code' |
79846 | * where only the boot processor is running with IRQ disabled. This means | 79838 | * where only the boot processor is running with IRQ disabled. This means |
79847 | @@ -153,6 +155,74 @@ static int __init set_reset_devices(char *str) | 79839 | @@ -154,6 +156,74 @@ static int __init set_reset_devices(char *str) |
79848 | 79840 | ||
79849 | __setup("reset_devices", set_reset_devices); | 79841 | __setup("reset_devices", set_reset_devices); |
79850 | 79842 | ||
@@ -79919,7 +79911,7 @@ index 9484f4b..0eac7c3 100644 | |||
79919 | static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; | 79911 | static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; |
79920 | const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; | 79912 | const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; |
79921 | static const char *panic_later, *panic_param; | 79913 | static const char *panic_later, *panic_param; |
79922 | @@ -655,8 +725,6 @@ static void __init do_ctors(void) | 79914 | @@ -656,8 +726,6 @@ static void __init do_ctors(void) |
79923 | bool initcall_debug; | 79915 | bool initcall_debug; |
79924 | core_param(initcall_debug, initcall_debug, bool, 0644); | 79916 | core_param(initcall_debug, initcall_debug, bool, 0644); |
79925 | 79917 | ||
@@ -79928,7 +79920,7 @@ index 9484f4b..0eac7c3 100644 | |||
79928 | static int __init_or_module do_one_initcall_debug(initcall_t fn) | 79920 | static int __init_or_module do_one_initcall_debug(initcall_t fn) |
79929 | { | 79921 | { |
79930 | ktime_t calltime, delta, rettime; | 79922 | ktime_t calltime, delta, rettime; |
79931 | @@ -679,23 +747,22 @@ int __init_or_module do_one_initcall(initcall_t fn) | 79923 | @@ -680,23 +748,22 @@ int __init_or_module do_one_initcall(initcall_t fn) |
79932 | { | 79924 | { |
79933 | int count = preempt_count(); | 79925 | int count = preempt_count(); |
79934 | int ret; | 79926 | int ret; |
@@ -79956,7 +79948,7 @@ index 9484f4b..0eac7c3 100644 | |||
79956 | 79948 | ||
79957 | return ret; | 79949 | return ret; |
79958 | } | 79950 | } |
79959 | @@ -748,8 +815,14 @@ static void __init do_initcall_level(int level) | 79951 | @@ -749,8 +816,14 @@ static void __init do_initcall_level(int level) |
79960 | level, level, | 79952 | level, level, |
79961 | &repair_env_string); | 79953 | &repair_env_string); |
79962 | 79954 | ||
@@ -79972,7 +79964,7 @@ index 9484f4b..0eac7c3 100644 | |||
79972 | } | 79964 | } |
79973 | 79965 | ||
79974 | static void __init do_initcalls(void) | 79966 | static void __init do_initcalls(void) |
79975 | @@ -783,8 +856,14 @@ static void __init do_pre_smp_initcalls(void) | 79967 | @@ -785,8 +858,14 @@ static void __init do_pre_smp_initcalls(void) |
79976 | { | 79968 | { |
79977 | initcall_t *fn; | 79969 | initcall_t *fn; |
79978 | 79970 | ||
@@ -79988,7 +79980,7 @@ index 9484f4b..0eac7c3 100644 | |||
79988 | } | 79980 | } |
79989 | 79981 | ||
79990 | /* | 79982 | /* |
79991 | @@ -802,8 +881,8 @@ static int run_init_process(const char *init_filename) | 79983 | @@ -804,8 +883,8 @@ static int run_init_process(const char *init_filename) |
79992 | { | 79984 | { |
79993 | argv_init[0] = init_filename; | 79985 | argv_init[0] = init_filename; |
79994 | return do_execve(init_filename, | 79986 | return do_execve(init_filename, |
@@ -79999,7 +79991,7 @@ index 9484f4b..0eac7c3 100644 | |||
79999 | } | 79991 | } |
80000 | 79992 | ||
80001 | static noinline void __init kernel_init_freeable(void); | 79993 | static noinline void __init kernel_init_freeable(void); |
80002 | @@ -880,7 +959,7 @@ static noinline void __init kernel_init_freeable(void) | 79994 | @@ -882,7 +961,7 @@ static noinline void __init kernel_init_freeable(void) |
80003 | do_basic_setup(); | 79995 | do_basic_setup(); |
80004 | 79996 | ||
80005 | /* Open the /dev/console on the rootfs, this should never fail */ | 79997 | /* Open the /dev/console on the rootfs, this should never fail */ |
@@ -80008,7 +80000,7 @@ index 9484f4b..0eac7c3 100644 | |||
80008 | pr_err("Warning: unable to open an initial console.\n"); | 80000 | pr_err("Warning: unable to open an initial console.\n"); |
80009 | 80001 | ||
80010 | (void) sys_dup(0); | 80002 | (void) sys_dup(0); |
80011 | @@ -893,11 +972,13 @@ static noinline void __init kernel_init_freeable(void) | 80003 | @@ -895,11 +974,13 @@ static noinline void __init kernel_init_freeable(void) |
80012 | if (!ramdisk_execute_command) | 80004 | if (!ramdisk_execute_command) |
80013 | ramdisk_execute_command = "/init"; | 80005 | ramdisk_execute_command = "/init"; |
80014 | 80006 | ||
@@ -80098,10 +80090,10 @@ index e4e47f6..a85e0ad 100644 | |||
80098 | if (u->mq_bytes + mq_bytes < u->mq_bytes || | 80090 | if (u->mq_bytes + mq_bytes < u->mq_bytes || |
80099 | u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) { | 80091 | u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) { |
80100 | diff --git a/ipc/msg.c b/ipc/msg.c | 80092 | diff --git a/ipc/msg.c b/ipc/msg.c |
80101 | index f8fbe2c..074649e 100644 | 80093 | index 558aa91..359e718 100644 |
80102 | --- a/ipc/msg.c | 80094 | --- a/ipc/msg.c |
80103 | +++ b/ipc/msg.c | 80095 | +++ b/ipc/msg.c |
80104 | @@ -296,18 +296,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) | 80096 | @@ -297,18 +297,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg) |
80105 | return security_msg_queue_associate(msq, msgflg); | 80097 | return security_msg_queue_associate(msq, msgflg); |
80106 | } | 80098 | } |
80107 | 80099 | ||
@@ -80127,10 +80119,10 @@ index f8fbe2c..074649e 100644 | |||
80127 | msg_params.flg = msgflg; | 80119 | msg_params.flg = msgflg; |
80128 | 80120 | ||
80129 | diff --git a/ipc/sem.c b/ipc/sem.c | 80121 | diff --git a/ipc/sem.c b/ipc/sem.c |
80130 | index 70480a3..f4e8262 100644 | 80122 | index 8c4f59b..3a3f4ff 100644 |
80131 | --- a/ipc/sem.c | 80123 | --- a/ipc/sem.c |
80132 | +++ b/ipc/sem.c | 80124 | +++ b/ipc/sem.c |
80133 | @@ -460,10 +460,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, | 80125 | @@ -562,10 +562,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp, |
80134 | return 0; | 80126 | return 0; |
80135 | } | 80127 | } |
80136 | 80128 | ||
@@ -80147,7 +80139,7 @@ index 70480a3..f4e8262 100644 | |||
80147 | struct ipc_params sem_params; | 80139 | struct ipc_params sem_params; |
80148 | 80140 | ||
80149 | ns = current->nsproxy->ipc_ns; | 80141 | ns = current->nsproxy->ipc_ns; |
80150 | @@ -471,10 +476,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) | 80142 | @@ -573,10 +578,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg) |
80151 | if (nsems < 0 || nsems > ns->sc_semmsl) | 80143 | if (nsems < 0 || nsems > ns->sc_semmsl) |
80152 | return -EINVAL; | 80144 | return -EINVAL; |
80153 | 80145 | ||
@@ -80159,10 +80151,10 @@ index 70480a3..f4e8262 100644 | |||
80159 | sem_params.flg = semflg; | 80151 | sem_params.flg = semflg; |
80160 | sem_params.u.nsems = nsems; | 80152 | sem_params.u.nsems = nsems; |
80161 | diff --git a/ipc/shm.c b/ipc/shm.c | 80153 | diff --git a/ipc/shm.c b/ipc/shm.c |
80162 | index 7e199fa..180a1ca 100644 | 80154 | index 7b87bea..fd0b9bd 100644 |
80163 | --- a/ipc/shm.c | 80155 | --- a/ipc/shm.c |
80164 | +++ b/ipc/shm.c | 80156 | +++ b/ipc/shm.c |
80165 | @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp); | 80157 | @@ -72,6 +72,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp); |
80166 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it); | 80158 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it); |
80167 | #endif | 80159 | #endif |
80168 | 80160 | ||
@@ -80177,7 +80169,7 @@ index 7e199fa..180a1ca 100644 | |||
80177 | void shm_init_ns(struct ipc_namespace *ns) | 80169 | void shm_init_ns(struct ipc_namespace *ns) |
80178 | { | 80170 | { |
80179 | ns->shm_ctlmax = SHMMAX; | 80171 | ns->shm_ctlmax = SHMMAX; |
80180 | @@ -531,6 +539,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) | 80172 | @@ -551,6 +559,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) |
80181 | shp->shm_lprid = 0; | 80173 | shp->shm_lprid = 0; |
80182 | shp->shm_atim = shp->shm_dtim = 0; | 80174 | shp->shm_atim = shp->shm_dtim = 0; |
80183 | shp->shm_ctim = get_seconds(); | 80175 | shp->shm_ctim = get_seconds(); |
@@ -80192,7 +80184,7 @@ index 7e199fa..180a1ca 100644 | |||
80192 | shp->shm_segsz = size; | 80184 | shp->shm_segsz = size; |
80193 | shp->shm_nattch = 0; | 80185 | shp->shm_nattch = 0; |
80194 | shp->shm_file = file; | 80186 | shp->shm_file = file; |
80195 | @@ -582,18 +598,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, | 80187 | @@ -604,18 +620,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp, |
80196 | return 0; | 80188 | return 0; |
80197 | } | 80189 | } |
80198 | 80190 | ||
@@ -80217,7 +80209,7 @@ index 7e199fa..180a1ca 100644 | |||
80217 | shm_params.key = key; | 80209 | shm_params.key = key; |
80218 | shm_params.flg = shmflg; | 80210 | shm_params.flg = shmflg; |
80219 | shm_params.u.size = size; | 80211 | shm_params.u.size = size; |
80220 | @@ -1014,6 +1031,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, | 80212 | @@ -1076,6 +1093,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, |
80221 | f_mode = FMODE_READ | FMODE_WRITE; | 80213 | f_mode = FMODE_READ | FMODE_WRITE; |
80222 | } | 80214 | } |
80223 | if (shmflg & SHM_EXEC) { | 80215 | if (shmflg & SHM_EXEC) { |
@@ -80230,7 +80222,7 @@ index 7e199fa..180a1ca 100644 | |||
80230 | prot |= PROT_EXEC; | 80222 | prot |= PROT_EXEC; |
80231 | acc_mode |= S_IXUGO; | 80223 | acc_mode |= S_IXUGO; |
80232 | } | 80224 | } |
80233 | @@ -1037,9 +1060,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, | 80225 | @@ -1100,10 +1123,22 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, |
80234 | if (err) | 80226 | if (err) |
80235 | goto out_unlock; | 80227 | goto out_unlock; |
80236 | 80228 | ||
@@ -80243,6 +80235,7 @@ index 7e199fa..180a1ca 100644 | |||
80243 | + } | 80235 | + } |
80244 | +#endif | 80236 | +#endif |
80245 | + | 80237 | + |
80238 | ipc_lock_object(&shp->shm_perm); | ||
80246 | path = shp->shm_file->f_path; | 80239 | path = shp->shm_file->f_path; |
80247 | path_get(&path); | 80240 | path_get(&path); |
80248 | shp->shm_nattch++; | 80241 | shp->shm_nattch++; |
@@ -80250,8 +80243,8 @@ index 7e199fa..180a1ca 100644 | |||
80250 | + shp->shm_lapid = current->pid; | 80243 | + shp->shm_lapid = current->pid; |
80251 | +#endif | 80244 | +#endif |
80252 | size = i_size_read(path.dentry->d_inode); | 80245 | size = i_size_read(path.dentry->d_inode); |
80253 | shm_unlock(shp); | 80246 | ipc_unlock_object(&shp->shm_perm); |
80254 | 80247 | rcu_read_unlock(); | |
80255 | diff --git a/kernel/acct.c b/kernel/acct.c | 80248 | diff --git a/kernel/acct.c b/kernel/acct.c |
80256 | index 8d6e145..33e0b1e 100644 | 80249 | index 8d6e145..33e0b1e 100644 |
80257 | --- a/kernel/acct.c | 80250 | --- a/kernel/acct.c |
@@ -90084,7 +90077,7 @@ index 6280da8..b5c090e 100644 | |||
90084 | 90077 | ||
90085 | /* | 90078 | /* |
90086 | diff --git a/mm/shmem.c b/mm/shmem.c | 90079 | diff --git a/mm/shmem.c b/mm/shmem.c |
90087 | index 5e6a842..b41916e 100644 | 90080 | index 509b393..49ecfea 100644 |
90088 | --- a/mm/shmem.c | 90081 | --- a/mm/shmem.c |
90089 | +++ b/mm/shmem.c | 90082 | +++ b/mm/shmem.c |
90090 | @@ -33,7 +33,7 @@ | 90083 | @@ -33,7 +33,7 @@ |