main/linux-grsec: grsecurity-2.9.1-3.8.2-201303111845

2 files changed, 24 insertions, 14 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 84ad89a591..b489b05761 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
 pkgname=linux-${_flavor}
 pkgver=3.8.2
 _kernver=3.8
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
 	http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
-	grsecurity-2.9.1-3.8.2-201303102007.patch
+	grsecurity-2.9.1-3.8.2-201303111845.patch
 
 	0004-arp-flush-arp-cache-on-device-change.patch
 	usb-ehci-revert-remove-ass-pss-polling-timeout.patch
@@ -143,21 +143,21 @@ dev() {
 
 md5sums="1c738edfc54e7c65faeb90c436104e2f  linux-3.8.tar.xz
 e282fcff76e975e121e0636018e31a56  patch-3.8.2.xz
-b7f8fd74ca2355e04bd6fb9761ff4b5f  grsecurity-2.9.1-3.8.2-201303102007.patch
+1bd92bea4325cafd07daa470810f1ea3  grsecurity-2.9.1-3.8.2-201303111845.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
 eb332f6769f785a1c6b54b1f49ffd01a  usb-ehci-revert-remove-ass-pss-polling-timeout.patch
 3bcafb0c6230e2279930027e48162d0a  kernelconfig.x86
 653949f92e603ec35e072fbdc58a414b  kernelconfig.x86_64"
 sha256sums="e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b  linux-3.8.tar.xz
 2bd1a39db4608a03250bfef11d3b7894ab1f0ebcb5316bafeeed23535822fd9c  patch-3.8.2.xz
-13ba06a41de3198729867c7fe5741b01a138298bc1d973dfcd8a3bec80127d01  grsecurity-2.9.1-3.8.2-201303102007.patch
+c969b85daf641db52925344b66527d92395b50011c17b889cea36ce753e0f7a0  grsecurity-2.9.1-3.8.2-201303111845.patch
 e2d2d1503f53572c6a2e21da729a13a430dd01f510405ffb3a33b29208860bde  0004-arp-flush-arp-cache-on-device-change.patch
 949393b84740cfe8a0d72d391ca2a89d24aa425df27c031f121fec7f7f331eed  usb-ehci-revert-remove-ass-pss-polling-timeout.patch
 f4f752af87b802ddfa201392906c4b7ec14a2239e994abd3fb08068824477cb4  kernelconfig.x86
 07e8251d7348414ee534d822fdf6561545309be87821032115d0161c443ad000  kernelconfig.x86_64"
 sha512sums="10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f  linux-3.8.tar.xz
 752a122646261461da9238feeacc61ab787bea9999f066b056226387ce718da57592e536eb1c6aa28b949f0a7ad1fa97cc97204fdc3e8f3939d9b0d3b9517d03  patch-3.8.2.xz
-4d7bf6b3635b9b6a673fd43eed6cd7f60ef18645b2447be521ac7e8fac9a8d6e38eba7d273dd654fad162c6171d0d5f8aa99b57662f669ff00dbede0626793de  grsecurity-2.9.1-3.8.2-201303102007.patch
+faff701455d4985cc7c54e4b41cb87a44382b567c5adaa0ffa5182c0e4a629660b08715205f982d668f12697550da8ce6ea07da4636d60789e8fc1833cce084a  grsecurity-2.9.1-3.8.2-201303111845.patch
 b6fdf376009f0f0f3fa194cb11be97343e4d394cf5d3547de6cfca8ad619c5bd3f60719331fd8cfadc47f09d22be8376ba5f871b46b24887ea73fe47e233a54e  0004-arp-flush-arp-cache-on-device-change.patch
 bb4576df6b5e029747975f5ed9d04c807d1bfd5e73f5418375f164a03342c15b2ca918e68bb6ff5bd0dc2fa8364e022aee18b254528210d2e24f8e06e6521609  usb-ehci-revert-remove-ass-pss-polling-timeout.patch
 9a37f22bbab39e7a2a35258a5004ad52e7ec40d1cb7e0e61df3e7c278fd1e0163f196fbb0110ef34b1984c5fae409c57b870e689f955c8520c2b27aa0afe8247  kernelconfig.x86
diff --git a/main/linux-grsec/grsecurity-2.9.1-3.8.2-201303102007.patch b/main/linux-grsec/grsecurity-2.9.1-3.8.2-201303111845.patch
index e5f056b25e..e088f8a718 100644
--- a/main/linux-grsec/grsecurity-2.9.1-3.8.2-201303102007.patch
+++ b/main/linux-grsec/grsecurity-2.9.1-3.8.2-201303111845.patch
@@ -76758,7 +76758,7 @@ index 81fa536..6ccf96a 100644
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 3d09cf6..a67d2c6 100644
+index 3d09cf6..8988390 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -50,12 +50,12 @@ static struct kmem_cache *sigqueue_cachep;
@@ -76795,7 +76795,17 @@ index 3d09cf6..a67d2c6 100644
  	if (override_rlimit ||
  	    atomic_read(&user->sigpending) <=
  			task_rlimit(t, RLIMIT_SIGPENDING)) {
-@@ -492,7 +495,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
+@@ -485,6 +488,9 @@ flush_signal_handlers(struct task_struct *t, int force_default)
+ 		if (force_default || ka->sa.sa_handler != SIG_IGN)
+ 			ka->sa.sa_handler = SIG_DFL;
+ 		ka->sa.sa_flags = 0;
++#ifdef SA_RESTORER
++		ka->sa.sa_restorer = NULL;
++#endif
+ 		sigemptyset(&ka->sa.sa_mask);
+ 		ka++;
+ 	}
+@@ -492,7 +498,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
  
  int unhandled_signal(struct task_struct *tsk, int sig)
  {
@@ -76804,7 +76814,7 @@ index 3d09cf6..a67d2c6 100644
  	if (is_global_init(tsk))
  		return 1;
  	if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -812,6 +815,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
+@@ -812,6 +818,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
  		}
  	}
  
@@ -76818,7 +76828,7 @@ index 3d09cf6..a67d2c6 100644
  	return security_task_kill(t, info, sig, 0);
  }
  
-@@ -1194,7 +1204,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1194,7 +1207,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
  	return send_signal(sig, info, p, 1);
  }
  
@@ -76827,7 +76837,7 @@ index 3d09cf6..a67d2c6 100644
  specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  {
  	return send_signal(sig, info, t, 0);
-@@ -1231,6 +1241,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1231,6 +1244,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  	unsigned long int flags;
  	int ret, blocked, ignored;
  	struct k_sigaction *action;
@@ -76835,7 +76845,7 @@ index 3d09cf6..a67d2c6 100644
  
  	spin_lock_irqsave(&t->sighand->siglock, flags);
  	action = &t->sighand->action[sig-1];
-@@ -1245,9 +1256,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1245,9 +1259,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  	}
  	if (action->sa.sa_handler == SIG_DFL)
  		t->signal->flags &= ~SIGNAL_UNKILLABLE;
@@ -76854,7 +76864,7 @@ index 3d09cf6..a67d2c6 100644
  	return ret;
  }
  
-@@ -1314,8 +1334,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1314,8 +1337,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
  	ret = check_kill_permission(sig, info, p);
  	rcu_read_unlock();
  
@@ -76867,7 +76877,7 @@ index 3d09cf6..a67d2c6 100644
  
  	return ret;
  }
-@@ -2852,7 +2875,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
+@@ -2852,7 +2878,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
  	int error = -ESRCH;
  
  	rcu_read_lock();
@@ -76884,7 +76894,7 @@ index 3d09cf6..a67d2c6 100644
  	if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
  		error = check_kill_permission(sig, info, p);
  		/*
-@@ -3135,8 +3166,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
+@@ -3135,8 +3169,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
  	}
  	seg = get_fs();
  	set_fs(KERNEL_DS);