Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 4.9.13/
Date: Tue, 07 Mar 2017 10:26:35
Message-Id: 1488882349.a571cade9990a876d9daa7e35a61f0844a11c41b.blueness@gentoo
1 commit: a571cade9990a876d9daa7e35a61f0844a11c41b
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue Mar 7 10:25:49 2017 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 7 10:25:49 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-patchset.git/commit/?id=a571cade
7
8 grsecurity-3.1-4.9.13-201703052141
9
10 4.9.13/0000_README | 2 +-
11 ... => 4420_grsecurity-3.1-4.9.13-201703052141.patch} | 19 ++++++++++++++++---
12 2 files changed, 17 insertions(+), 4 deletions(-)
13
14 diff --git a/4.9.13/0000_README b/4.9.13/0000_README
15 index 733ff59..f323ffe 100644
16 --- a/4.9.13/0000_README
17 +++ b/4.9.13/0000_README
18 @@ -6,7 +6,7 @@ Patch: 1012_linux-4.9.13.patch
19 From: http://www.kernel.org
20 Desc: Linux 4.9.13
21
22 -Patch: 4420_grsecurity-3.1-4.9.13-201702270729.patch
23 +Patch: 4420_grsecurity-3.1-4.9.13-201703052141.patch
24 From: http://www.grsecurity.net
25 Desc: hardened-sources base patch from upstream grsecurity
26
27
28 diff --git a/4.9.13/4420_grsecurity-3.1-4.9.13-201702270729.patch b/4.9.13/4420_grsecurity-3.1-4.9.13-201703052141.patch
29 similarity index 99%
30 rename from 4.9.13/4420_grsecurity-3.1-4.9.13-201702270729.patch
31 rename to 4.9.13/4420_grsecurity-3.1-4.9.13-201703052141.patch
32 index c9d116e..66274b3 100644
33 --- a/4.9.13/4420_grsecurity-3.1-4.9.13-201702270729.patch
34 +++ b/4.9.13/4420_grsecurity-3.1-4.9.13-201703052141.patch
35 @@ -51464,6 +51464,19 @@ index f86c844..7fe4fde9 100644
36 + .put_node = amdgpu_gtt_mgr_del,
37 + .debug = amdgpu_gtt_mgr_debug
38 };
39 +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
40 +index 8255034..43965e8 100644
41 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
42 ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
43 +@@ -31,7 +31,7 @@
44 + #include <drm/amdgpu_drm.h>
45 + #include "amdgpu.h"
46 +
47 +-#define AMDGPU_BO_INVALID_OFFSET LONG_MAX
48 ++#define AMDGPU_BO_INVALID_OFFSET (LONG_MAX >> PAGE_SHIFT)
49 +
50 + /**
51 + * amdgpu_mem_type_to_domain - return domain corresponding to mem_type
52 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
53 index 968c426..aceb28c 100644
54 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
55 @@ -75243,7 +75256,7 @@ index 88a44a7..de358ce 100644
56
57 status = cpci_hp_register_controller(&generic_hpc);
58 diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
59 -index 5f49c3f..438f019 100644
60 +index 5f49c3f..18c4d10 100644
61 --- a/drivers/pci/hotplug/cpcihp_zt5550.c
62 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c
63 @@ -59,7 +59,6 @@
64 @@ -75283,7 +75296,7 @@ index 5f49c3f..438f019 100644
65 + const_cast(zt5550_hpc_ops.enable_irq) = zt5550_hc_enable_irq;
66 + const_cast(zt5550_hpc_ops.disable_irq) = zt5550_hc_disable_irq;
67 + const_cast(zt5550_hpc_ops.check_irq) = zt5550_hc_check_irq;
68 -+ pax_open_kernel();
69 ++ pax_close_kernel();
70 } else {
71 info("using ENUM# polling mode");
72 }
73 @@ -170584,7 +170597,7 @@ index 6cbe5bd..04c4e00 100644
74 .sysctl_rmem = sysctl_sctp_rmem,
75 .sysctl_wmem = sysctl_sctp_wmem,
76 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
77 -index daf8554..4ab495b 100644
78 +index daf8554..4ab495b0 100644
79 --- a/net/sctp/sysctl.c
80 +++ b/net/sctp/sysctl.c
81 @@ -324,7 +324,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,