summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-11-04 09:59:52 -0500
committerAnthony G. Basile <blueness@gentoo.org>2014-11-04 09:59:52 -0500
commitab05af49d04c811aae4fe293282f819540e22288 (patch)
treee07baaeed4f57024f5775c71d8ec9e601a233ff1
parentGrsec/PaX: 3.0-{3.2.63,3.14.23,3.17.2}-201410312212 (diff)
downloadhardened-patchset-ab05af49d04c811aae4fe293282f819540e22288.tar.gz
hardened-patchset-ab05af49d04c811aae4fe293282f819540e22288.tar.bz2
hardened-patchset-ab05af49d04c811aae4fe293282f819540e22288.zip
Grsec/PaX: 3.0-3.2.63-20141102080820141102
-rw-r--r--3.2.63/0000_README2
-rw-r--r--3.2.63/4420_grsecurity-3.0-3.2.63-201411020808.patch (renamed from 3.2.63/4420_grsecurity-3.0-3.2.63-201410312211.patch)11
2 files changed, 11 insertions, 2 deletions
diff --git a/3.2.63/0000_README b/3.2.63/0000_README
index 1c94b09..dc58512 100644
--- a/3.2.63/0000_README
+++ b/3.2.63/0000_README
@@ -170,7 +170,7 @@ Patch: 1062_linux-3.2.63.patch
From: http://www.kernel.org
Desc: Linux 3.2.63
-Patch: 4420_grsecurity-3.0-3.2.63-201410312211.patch
+Patch: 4420_grsecurity-3.0-3.2.63-201411020808.patch
From: http://www.grsecurity.net
Desc: hardened-sources base patch from upstream grsecurity
diff --git a/3.2.63/4420_grsecurity-3.0-3.2.63-201410312211.patch b/3.2.63/4420_grsecurity-3.0-3.2.63-201411020808.patch
index 82f3ff6..ab7ff79 100644
--- a/3.2.63/4420_grsecurity-3.0-3.2.63-201410312211.patch
+++ b/3.2.63/4420_grsecurity-3.0-3.2.63-201411020808.patch
@@ -105155,7 +105155,7 @@ index c69358c..d1e5855 100644
static int tcp6_seq_show(struct seq_file *seq, void *v)
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index f8bec1e..8628321 100644
+index f8bec1e..e2c60f8 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -50,6 +50,10 @@
@@ -105206,6 +105206,15 @@ index f8bec1e..8628321 100644
bh_unlock_sock(sk);
sock_put(sk);
goto discard;
+@@ -1362,7 +1369,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, u32 features)
+ fptr = (struct frag_hdr *)(skb_network_header(skb) + unfrag_ip6hlen);
+ fptr->nexthdr = nexthdr;
+ fptr->reserved = 0;
+- ipv6_select_ident(fptr, (struct rt6_info *)skb_dst(skb));
++ fptr->identification = skb_shinfo(skb)->ip6_frag_id;
+
+ /* Fragment the skb. ipv6 header and the remaining fields of the
+ * fragment header are updated in ipv6_gso_segment()
@@ -1409,8 +1416,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
0, 0L, 0,
sock_i_uid(sp), 0,