1 |
commit: f300e4f94563004297b1c11a5cd2f20627ac5f8f |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 9 11:49:48 2014 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 9 11:49:48 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=f300e4f9 |
7 |
|
8 |
Grsec/PaX: 3.0-{3.2.60,3.14.11,3.15.4}-201407081937 |
9 |
|
10 |
--- |
11 |
3.14.11/0000_README | 2 +- |
12 |
...4420_grsecurity-3.0-3.14.11-201407081919.patch} | 24 ---------------------- |
13 |
... 4420_grsecurity-3.0-3.15.4-201407081937.patch} | 24 ---------------------- |
14 |
3.2.60/0000_README | 2 +- |
15 |
... 4420_grsecurity-3.0-3.2.60-201407081916.patch} | 24 +--------------------- |
16 |
5 files changed, 3 insertions(+), 73 deletions(-) |
17 |
|
18 |
diff --git a/3.14.11/0000_README b/3.14.11/0000_README |
19 |
index 4a9468b..b3b205b 100644 |
20 |
--- a/3.14.11/0000_README |
21 |
+++ b/3.14.11/0000_README |
22 |
@@ -2,7 +2,7 @@ README |
23 |
----------------------------------------------------------------------------- |
24 |
Individual Patch Descriptions: |
25 |
----------------------------------------------------------------------------- |
26 |
-Patch: 4420_grsecurity-3.0-3.14.11-201407072045.patch |
27 |
+Patch: 4420_grsecurity-3.0-3.14.11-201407081919.patch |
28 |
From: http://www.grsecurity.net |
29 |
Desc: hardened-sources base patch from upstream grsecurity |
30 |
|
31 |
|
32 |
diff --git a/3.14.11/4420_grsecurity-3.0-3.14.11-201407072045.patch b/3.14.11/4420_grsecurity-3.0-3.14.11-201407081919.patch |
33 |
similarity index 99% |
34 |
rename from 3.14.11/4420_grsecurity-3.0-3.14.11-201407072045.patch |
35 |
rename to 3.14.11/4420_grsecurity-3.0-3.14.11-201407081919.patch |
36 |
index a883f75..fc0ad0c 100644 |
37 |
--- a/3.14.11/4420_grsecurity-3.0-3.14.11-201407072045.patch |
38 |
+++ b/3.14.11/4420_grsecurity-3.0-3.14.11-201407081919.patch |
39 |
@@ -46374,18 +46374,6 @@ index cf49c22..971b133 100644 |
40 |
struct attribute **attributes; |
41 |
struct sm_sysfs_attribute *vendor_attribute; |
42 |
char *vendor; |
43 |
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c |
44 |
-index 91ec8cd..562ff5f 100644 |
45 |
---- a/drivers/net/bonding/bond_main.c |
46 |
-+++ b/drivers/net/bonding/bond_main.c |
47 |
-@@ -4552,6 +4552,7 @@ static void __exit bonding_exit(void) |
48 |
- |
49 |
- bond_netlink_fini(); |
50 |
- unregister_pernet_subsys(&bond_net_ops); |
51 |
-+ rtnl_link_unregister(&bond_link_ops); |
52 |
- |
53 |
- #ifdef CONFIG_NET_POLL_CONTROLLER |
54 |
- /* |
55 |
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c |
56 |
index 70651f8..7eb1bdf 100644 |
57 |
--- a/drivers/net/bonding/bond_netlink.c |
58 |
@@ -46888,18 +46876,6 @@ index 3381c4f..dea5fd5 100644 |
59 |
.notifier_call = macvtap_device_event, |
60 |
}; |
61 |
|
62 |
-diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c |
63 |
-index daec9b0..6428fcb 100644 |
64 |
---- a/drivers/net/phy/mdio-bitbang.c |
65 |
-+++ b/drivers/net/phy/mdio-bitbang.c |
66 |
-@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus) |
67 |
- struct mdiobb_ctrl *ctrl = bus->priv; |
68 |
- |
69 |
- module_put(ctrl->ops->owner); |
70 |
-+ mdiobus_unregister(bus); |
71 |
- mdiobus_free(bus); |
72 |
- } |
73 |
- EXPORT_SYMBOL(free_mdio_bitbang); |
74 |
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c |
75 |
index 72ff14b..11d442d 100644 |
76 |
--- a/drivers/net/ppp/ppp_generic.c |
77 |
|
78 |
diff --git a/3.15.4/4420_grsecurity-3.0-3.15.4-201407072046.patch b/3.15.4/4420_grsecurity-3.0-3.15.4-201407081937.patch |
79 |
similarity index 99% |
80 |
rename from 3.15.4/4420_grsecurity-3.0-3.15.4-201407072046.patch |
81 |
rename to 3.15.4/4420_grsecurity-3.0-3.15.4-201407081937.patch |
82 |
index 0dbb183..fbbdd34 100644 |
83 |
--- a/3.15.4/4420_grsecurity-3.0-3.15.4-201407072046.patch |
84 |
+++ b/3.15.4/4420_grsecurity-3.0-3.15.4-201407081937.patch |
85 |
@@ -45726,18 +45726,6 @@ index cf49c22..971b133 100644 |
86 |
struct attribute **attributes; |
87 |
struct sm_sysfs_attribute *vendor_attribute; |
88 |
char *vendor; |
89 |
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c |
90 |
-index d3a6789..198ec21 100644 |
91 |
---- a/drivers/net/bonding/bond_main.c |
92 |
-+++ b/drivers/net/bonding/bond_main.c |
93 |
-@@ -4504,6 +4504,7 @@ static void __exit bonding_exit(void) |
94 |
- |
95 |
- bond_netlink_fini(); |
96 |
- unregister_pernet_subsys(&bond_net_ops); |
97 |
-+ rtnl_link_unregister(&bond_link_ops); |
98 |
- |
99 |
- #ifdef CONFIG_NET_POLL_CONTROLLER |
100 |
- /* |
101 |
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c |
102 |
index f847e16..fc8dbe9 100644 |
103 |
--- a/drivers/net/bonding/bond_netlink.c |
104 |
@@ -46253,18 +46241,6 @@ index 3381c4f..dea5fd5 100644 |
105 |
.notifier_call = macvtap_device_event, |
106 |
}; |
107 |
|
108 |
-diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c |
109 |
-index daec9b0..6428fcb 100644 |
110 |
---- a/drivers/net/phy/mdio-bitbang.c |
111 |
-+++ b/drivers/net/phy/mdio-bitbang.c |
112 |
-@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus) |
113 |
- struct mdiobb_ctrl *ctrl = bus->priv; |
114 |
- |
115 |
- module_put(ctrl->ops->owner); |
116 |
-+ mdiobus_unregister(bus); |
117 |
- mdiobus_free(bus); |
118 |
- } |
119 |
- EXPORT_SYMBOL(free_mdio_bitbang); |
120 |
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c |
121 |
index e3923eb..2a0373b 100644 |
122 |
--- a/drivers/net/ppp/ppp_generic.c |
123 |
|
124 |
diff --git a/3.2.60/0000_README b/3.2.60/0000_README |
125 |
index f6a6bee..86d5902 100644 |
126 |
--- a/3.2.60/0000_README |
127 |
+++ b/3.2.60/0000_README |
128 |
@@ -158,7 +158,7 @@ Patch: 1059_linux-3.2.60.patch |
129 |
From: http://www.kernel.org |
130 |
Desc: Linux 3.2.60 |
131 |
|
132 |
-Patch: 4420_grsecurity-3.0-3.2.60-201407072042.patch |
133 |
+Patch: 4420_grsecurity-3.0-3.2.60-201407081916.patch |
134 |
From: http://www.grsecurity.net |
135 |
Desc: hardened-sources base patch from upstream grsecurity |
136 |
|
137 |
|
138 |
diff --git a/3.2.60/4420_grsecurity-3.0-3.2.60-201407072042.patch b/3.2.60/4420_grsecurity-3.0-3.2.60-201407081916.patch |
139 |
similarity index 99% |
140 |
rename from 3.2.60/4420_grsecurity-3.0-3.2.60-201407072042.patch |
141 |
rename to 3.2.60/4420_grsecurity-3.0-3.2.60-201407081916.patch |
142 |
index b3267bc..3dc65d9 100644 |
143 |
--- a/3.2.60/4420_grsecurity-3.0-3.2.60-201407072042.patch |
144 |
+++ b/3.2.60/4420_grsecurity-3.0-3.2.60-201407081916.patch |
145 |
@@ -43652,7 +43652,7 @@ index a9ff89ff..461d313 100644 |
146 |
struct sm_sysfs_attribute *vendor_attribute; |
147 |
|
148 |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c |
149 |
-index 5af2a8f..9b833b4 100644 |
150 |
+index 5af2a8f..728995b 100644 |
151 |
--- a/drivers/net/bonding/bond_main.c |
152 |
+++ b/drivers/net/bonding/bond_main.c |
153 |
@@ -4803,7 +4803,7 @@ static int bond_get_tx_queues(struct net *net, struct nlattr *tb[], |
154 |
@@ -43664,16 +43664,6 @@ index 5af2a8f..9b833b4 100644 |
155 |
.kind = "bond", |
156 |
.priv_size = sizeof(struct bonding), |
157 |
.setup = bond_setup, |
158 |
-@@ -4929,8 +4929,8 @@ static void __exit bonding_exit(void) |
159 |
- |
160 |
- bond_destroy_debugfs(); |
161 |
- |
162 |
-- rtnl_link_unregister(&bond_link_ops); |
163 |
- unregister_pernet_subsys(&bond_net_ops); |
164 |
-+ rtnl_link_unregister(&bond_link_ops); |
165 |
- |
166 |
- #ifdef CONFIG_NET_POLL_CONTROLLER |
167 |
- /* |
168 |
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c |
169 |
index cf95bd8d..f61f675 100644 |
170 |
--- a/drivers/net/bonding/bond_sysfs.c |
171 |
@@ -44387,18 +44377,6 @@ index b0f9015..edcb1f3 100644 |
172 |
.notifier_call = macvtap_device_event, |
173 |
}; |
174 |
|
175 |
-diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c |
176 |
-index 6539189..09875ce 100644 |
177 |
---- a/drivers/net/phy/mdio-bitbang.c |
178 |
-+++ b/drivers/net/phy/mdio-bitbang.c |
179 |
-@@ -225,6 +225,7 @@ void free_mdio_bitbang(struct mii_bus *bus) |
180 |
- struct mdiobb_ctrl *ctrl = bus->priv; |
181 |
- |
182 |
- module_put(ctrl->ops->owner); |
183 |
-+ mdiobus_unregister(bus); |
184 |
- mdiobus_free(bus); |
185 |
- } |
186 |
- EXPORT_SYMBOL(free_mdio_bitbang); |
187 |
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c |
188 |
index 3ed983c..a1bb418 100644 |
189 |
--- a/drivers/net/ppp/ppp_generic.c |