From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7BB1D13877A for ; Fri, 18 Jul 2014 10:44:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79D16E093B; Fri, 18 Jul 2014 10:44:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBA24E093B for ; Fri, 18 Jul 2014 10:44:05 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB5B13400D6 for ; Fri, 18 Jul 2014 10:44:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 6ADD61807D for ; Fri, 18 Jul 2014 10:44:03 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1405680281.6fdbf3dcaebc451852e209c343f97b4c4f07b570.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 3.15.5/, 3.14.12/, 3.2.61/ X-VCS-Repository: proj/hardened-patchset X-VCS-Files: 3.14.12/0000_README 3.14.12/4420_grsecurity-3.0-3.14.12-201407151838.patch 3.14.12/4420_grsecurity-3.0-3.14.12-201407170638.patch 3.15.5/0000_README 3.15.5/4420_grsecurity-3.0-3.15.5-201407151839.patch 3.15.5/4420_grsecurity-3.0-3.15.5-201407170639.patch 3.2.61/0000_README 3.2.61/4420_grsecurity-3.0-3.2.61-201407151835.patch 3.2.61/4420_grsecurity-3.0-3.2.61-201407170636.patch X-VCS-Directories: 3.15.5/ 3.14.12/ 3.2.61/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 6fdbf3dcaebc451852e209c343f97b4c4f07b570 X-VCS-Branch: master Date: Fri, 18 Jul 2014 10:44:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0988e48f-969a-48e2-a68c-5067dfc2edad X-Archives-Hash: 85435fdacd43845db5f8cf49dc8dae28 commit: 6fdbf3dcaebc451852e209c343f97b4c4f07b570 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Jul 18 10:44:41 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Jul 18 10:44:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-patchset.git;a=commit;h=6fdbf3dc Grsec/PaX: 3.0-{3.2.60,3.14.12,3.15.5}-201407170639 --- 3.14.12/0000_README | 2 +- ...4420_grsecurity-3.0-3.14.12-201407170638.patch} | 24 +++++++++++++++++++- 3.15.5/0000_README | 2 +- ... 4420_grsecurity-3.0-3.15.5-201407170639.patch} | 24 +++++++++++++++++++- 3.2.61/0000_README | 2 +- ... 4420_grsecurity-3.0-3.2.61-201407170636.patch} | 26 ++++++++++++++++++++-- 6 files changed, 73 insertions(+), 7 deletions(-) diff --git a/3.14.12/0000_README b/3.14.12/0000_README index 6360d1d..857c6a1 100644 --- a/3.14.12/0000_README +++ b/3.14.12/0000_README @@ -2,7 +2,7 @@ README ----------------------------------------------------------------------------- Individual Patch Descriptions: ----------------------------------------------------------------------------- -Patch: 4420_grsecurity-3.0-3.14.12-201407151838.patch +Patch: 4420_grsecurity-3.0-3.14.12-201407170638.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.14.12/4420_grsecurity-3.0-3.14.12-201407151838.patch b/3.14.12/4420_grsecurity-3.0-3.14.12-201407170638.patch similarity index 99% rename from 3.14.12/4420_grsecurity-3.0-3.14.12-201407151838.patch rename to 3.14.12/4420_grsecurity-3.0-3.14.12-201407170638.patch index a8bccce..02636ed 100644 --- a/3.14.12/4420_grsecurity-3.0-3.14.12-201407151838.patch +++ b/3.14.12/4420_grsecurity-3.0-3.14.12-201407170638.patch @@ -8567,7 +8567,7 @@ index 1d0848b..d74685f 100644 #endif } diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c -index 6cff040..74ac5d1 100644 +index 6cff040..74ac5d1b 100644 --- a/arch/powerpc/kernel/module_32.c +++ b/arch/powerpc/kernel/module_32.c @@ -161,7 +161,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr, @@ -101749,6 +101749,28 @@ index 7932697..a13d158 100644 } while (!res); return res; } +diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c +index ec66063..1e05bbd 100644 +--- a/net/l2tp/l2tp_ppp.c ++++ b/net/l2tp/l2tp_ppp.c +@@ -1368,7 +1368,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname, + int err; + + if (level != SOL_PPPOL2TP) +- return udp_prot.setsockopt(sk, level, optname, optval, optlen); ++ return -EINVAL; + + if (optlen < sizeof(int)) + return -EINVAL; +@@ -1494,7 +1494,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname, + struct pppol2tp_session *ps; + + if (level != SOL_PPPOL2TP) +- return udp_prot.getsockopt(sk, level, optname, optval, optlen); ++ return -EINVAL; + + if (get_user(len, optlen)) + return -EFAULT; diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 1a3c7e0..80f8b0c 100644 --- a/net/llc/llc_proc.c diff --git a/3.15.5/0000_README b/3.15.5/0000_README index 6d4dc1c..6000532 100644 --- a/3.15.5/0000_README +++ b/3.15.5/0000_README @@ -2,7 +2,7 @@ README ----------------------------------------------------------------------------- Individual Patch Descriptions: ----------------------------------------------------------------------------- -Patch: 4420_grsecurity-3.0-3.15.5-201407151839.patch +Patch: 4420_grsecurity-3.0-3.15.5-201407170639.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.15.5/4420_grsecurity-3.0-3.15.5-201407151839.patch b/3.15.5/4420_grsecurity-3.0-3.15.5-201407170639.patch similarity index 99% rename from 3.15.5/4420_grsecurity-3.0-3.15.5-201407151839.patch rename to 3.15.5/4420_grsecurity-3.0-3.15.5-201407170639.patch index eb81858..7a5e81c 100644 --- a/3.15.5/4420_grsecurity-3.0-3.15.5-201407151839.patch +++ b/3.15.5/4420_grsecurity-3.0-3.15.5-201407170639.patch @@ -8597,7 +8597,7 @@ index ca1cd74..6f0241a 100644 #endif } diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c -index 6cff040..74ac5d1 100644 +index 6cff040..74ac5d1b 100644 --- a/arch/powerpc/kernel/module_32.c +++ b/arch/powerpc/kernel/module_32.c @@ -161,7 +161,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr, @@ -101634,6 +101634,28 @@ index 3397fe6..861fd1a 100644 } if (inet->cmsg_flags) ip_cmsg_recv(msg, skb); +diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c +index 950909f..13752d9 100644 +--- a/net/l2tp/l2tp_ppp.c ++++ b/net/l2tp/l2tp_ppp.c +@@ -1365,7 +1365,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname, + int err; + + if (level != SOL_PPPOL2TP) +- return udp_prot.setsockopt(sk, level, optname, optval, optlen); ++ return -EINVAL; + + if (optlen < sizeof(int)) + return -EINVAL; +@@ -1491,7 +1491,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname, + struct pppol2tp_session *ps; + + if (level != SOL_PPPOL2TP) +- return udp_prot.getsockopt(sk, level, optname, optval, optlen); ++ return -EINVAL; + + if (get_user(len, optlen)) + return -EFAULT; diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 1a3c7e0..80f8b0c 100644 --- a/net/llc/llc_proc.c diff --git a/3.2.61/0000_README b/3.2.61/0000_README index 7e2949e..c0718d5 100644 --- a/3.2.61/0000_README +++ b/3.2.61/0000_README @@ -162,7 +162,7 @@ Patch: 1060_linux-3.2.61.patch From: http://www.kernel.org Desc: Linux 3.2.61 -Patch: 4420_grsecurity-3.0-3.2.61-201407151835.patch +Patch: 4420_grsecurity-3.0-3.2.61-201407170636.patch From: http://www.grsecurity.net Desc: hardened-sources base patch from upstream grsecurity diff --git a/3.2.61/4420_grsecurity-3.0-3.2.61-201407151835.patch b/3.2.61/4420_grsecurity-3.0-3.2.61-201407170636.patch similarity index 99% rename from 3.2.61/4420_grsecurity-3.0-3.2.61-201407151835.patch rename to 3.2.61/4420_grsecurity-3.0-3.2.61-201407170636.patch index 6bea5d8..d53a91b 100644 --- a/3.2.61/4420_grsecurity-3.0-3.2.61-201407151835.patch +++ b/3.2.61/4420_grsecurity-3.0-3.2.61-201407170636.patch @@ -56622,7 +56622,7 @@ index 739fb59..5385976 100644 static int __init init_cramfs_fs(void) { diff --git a/fs/dcache.c b/fs/dcache.c -index d322929..9f4b816 100644 +index d322929..9f4b8167 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -103,11 +103,11 @@ static unsigned int d_hash_shift __read_mostly; @@ -83398,7 +83398,7 @@ index 0000000..d6b4440 + +#endif /* _LINUX_VIRTIO_SCSI_H */ diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h -index 4bde182..1eb2c43 100644 +index 4bde182..1eb2c432 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */ @@ -103426,6 +103426,28 @@ index 93a41a0..d4b4edb 100644 NLA_PUT_U32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id); NLA_PUT_U32(skb, L2TP_ATTR_SESSION_ID, session->session_id); +diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c +index e0f0934..437fb59 100644 +--- a/net/l2tp/l2tp_ppp.c ++++ b/net/l2tp/l2tp_ppp.c +@@ -1351,7 +1351,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname, + int err; + + if (level != SOL_PPPOL2TP) +- return udp_prot.setsockopt(sk, level, optname, optval, optlen); ++ return -EINVAL; + + if (optlen < sizeof(int)) + return -EINVAL; +@@ -1477,7 +1477,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, + struct pppol2tp_session *ps; + + if (level != SOL_PPPOL2TP) +- return udp_prot.getsockopt(sk, level, optname, optval, optlen); ++ return -EINVAL; + + if (get_user(len, (int __user *) optlen)) + return -EFAULT; diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index a1839c0..4e06b9b 100644 --- a/net/llc/llc_proc.c