Commit 9c535a4e authored by Natanael Copa's avatar Natanael Copa

main/linux-grsec: upgrade to 2.9.1-3.6.2-201210151829

parent fa593c6b
From 84799010fc72913eb398674f8da7df525bde8fcb Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 16 Jul 2012 08:14:31 +0200
Subject: [PATCH] Revert "ipv4: Don't use the cached pmtu informations for
input routes"
This reverts commit 261663b0ee2ee8e3947f4c11c1a08be18cd2cea1.
---
net/ipv4/route.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 167ea10..f21e282 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1917,15 +1917,15 @@ static unsigned int ipv4_default_advmss(const struct dst_entry *dst)
static unsigned int ipv4_mtu(const struct dst_entry *dst)
{
- const struct rtable *rt = (const struct rtable *) dst;
unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);
- if (mtu && rt_is_output_route(rt))
+ if (mtu)
return mtu;
mtu = dst->dev->mtu;
if (unlikely(dst_metric_locked(dst, RTAX_MTU))) {
+ const struct rtable *rt = (const struct rtable *) dst;
if (rt->rt_gateway != rt->rt_dst && mtu > 576)
mtu = 576;
--
1.7.11.2
......@@ -2,8 +2,8 @@
_flavor=grsec
pkgname=linux-${_flavor}
pkgver=3.4.13
_kernver=3.4
pkgver=3.6.2
_kernver=3.6
pkgrel=0
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
......@@ -14,11 +14,9 @@ _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-$pkgver-0.patch
grsecurity-2.9.1-3.6.2-201210151829.patch
0004-arp-flush-arp-cache-on-device-change.patch
0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch
intel_idle.patch
kernelconfig.x86
kernelconfig.x86_64
......@@ -140,11 +138,9 @@ dev() {
"$subpkgdir"/lib/modules/${_abi_release}/build
}
md5sums="967f72983655e2479f951195953e8480 linux-3.4.tar.xz
65c1d3da2074c552e0a405a1c2f44310 patch-3.4.13.xz
85662da416e9680c687576fa035e9918 grsecurity-2.9.1-3.4.13-0.patch
md5sums="1a1760420eac802c541a20ab51a093d1 linux-3.6.tar.xz
ad1020c82a71ee1ef2416a0d12e724df patch-3.6.2.xz
c64b40d5b75594c066e014c19dad244c grsecurity-2.9.1-3.6.2-201210151829.patch
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
cb6fcd6e966e73c87a839c4c0183f81f 0001-Revert-ipv4-Don-t-use-the-cached-pmtu-informations-f.patch
d2f7ba780ff7567c21381428264d7fdd intel_idle.patch
50a13359236dbd676fa355f0b4fd27ff kernelconfig.x86
c402f52babc729d1280c1677075aa0d7 kernelconfig.x86_64"
80def301b4cf710e0855d4058efe46bb kernelconfig.x86
8eddcd9b36f4c2580e0b2db91eed3366 kernelconfig.x86_64"
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 16 Aug 2012 20:06:55 +0000 (+0200)
Subject: intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
X-Git-Tag: v3.6-rc3~33^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=commitdiff_plain;h=3735d524da64b70b41c764359da36f88aded3610
intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.
If the machine is booted without any cpu_idle driver set
(b/c disable_cpuidle() has been called) we should follow
other users of cpu_idle API and check the return value
for NULL before using it.
Reported-and-tested-by: Mark van Dijk <mark@internecto.net>
Suggested-by: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index f559088..e872617 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -606,8 +606,9 @@ static int __init intel_idle_init(void)
intel_idle_cpuidle_driver_init();
retval = cpuidle_register_driver(&intel_idle_driver);
if (retval) {
+ struct cpuidle_driver *drv = cpuidle_get_driver();
printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
- cpuidle_get_driver()->name);
+ drv ? drv->name : "none");
return retval;
}
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment