Update to 3.6.4
svn path=/dists/trunk/linux/; revision=19461
This commit is contained in:
Ben Hutchings
parent
543d408ab2
commit
a366f23fc9
|
|
@ -1,10 +1,11 @@
|
|||
linux (3.6.3-1~experimental.1) UNRELEASED; urgency=low
|
||||
linux (3.6.4-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream release: http://kernelnewbies.org/Linux_3.6
|
||||
* New upstream stable update:
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.1
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.2
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.3
|
||||
http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.4
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* aufs: Update to aufs3.x-rcN-20120827
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
From: Bryan Schumaker <bjschuma@netapp.com>
|
||||
Date: Mon, 24 Sep 2012 13:39:01 -0400
|
||||
Subject: SUNRPC: Set alloc_slot for backchannel tcp ops
|
||||
|
||||
commit 84e28a307e376f271505af65a7b7e212dd6f61f4 upstream.
|
||||
|
||||
f39c1bfb5a03e2d255451bff05be0d7255298fa4 (SUNRPC: Fix a UDP transport
|
||||
regression) introduced the "alloc_slot" function for xprt operations,
|
||||
but never created one for the backchannel operations. This patch fixes
|
||||
a null pointer dereference when mounting NFS over v4.1.
|
||||
|
||||
Call Trace:
|
||||
[<ffffffffa0207957>] ? xprt_reserve+0x47/0x50 [sunrpc]
|
||||
[<ffffffffa02023a4>] call_reserve+0x34/0x60 [sunrpc]
|
||||
[<ffffffffa020e280>] __rpc_execute+0x90/0x400 [sunrpc]
|
||||
[<ffffffffa020e61a>] rpc_async_schedule+0x2a/0x40 [sunrpc]
|
||||
[<ffffffff81073589>] process_one_work+0x139/0x500
|
||||
[<ffffffff81070e70>] ? alloc_worker+0x70/0x70
|
||||
[<ffffffffa020e5f0>] ? __rpc_execute+0x400/0x400 [sunrpc]
|
||||
[<ffffffff81073d1e>] worker_thread+0x15e/0x460
|
||||
[<ffffffff8145c839>] ? preempt_schedule+0x49/0x70
|
||||
[<ffffffff81073bc0>] ? rescuer_thread+0x230/0x230
|
||||
[<ffffffff81079603>] kthread+0x93/0xa0
|
||||
[<ffffffff81465d04>] kernel_thread_helper+0x4/0x10
|
||||
[<ffffffff81079570>] ? kthread_freezable_should_stop+0x70/0x70
|
||||
[<ffffffff81465d00>] ? gs_change+0x13/0x13
|
||||
|
||||
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
|
||||
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
|
||||
---
|
||||
net/sunrpc/xprtsock.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
|
||||
index d1988cf..97f8918 100644
|
||||
--- a/net/sunrpc/xprtsock.c
|
||||
+++ b/net/sunrpc/xprtsock.c
|
||||
@@ -2539,6 +2539,7 @@ static struct rpc_xprt_ops xs_tcp_ops = {
|
||||
static struct rpc_xprt_ops bc_tcp_ops = {
|
||||
.reserve_xprt = xprt_reserve_xprt,
|
||||
.release_xprt = xprt_release_xprt,
|
||||
+ .alloc_slot = xprt_alloc_slot,
|
||||
.rpcbind = xs_local_rpcbind,
|
||||
.buf_alloc = bc_malloc,
|
||||
.buf_free = bc_free,
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
From: Kees Cook <keescook@chromium.org>
|
||||
Date: Fri, 19 Oct 2012 13:56:51 -0700
|
||||
Subject: [1/2] kernel/sys.c: fix stack memory content leak via UNAME26
|
||||
|
||||
commit 2702b1526c7278c4d65d78de209a465d4de2885e upstream.
|
||||
|
||||
Calling uname() with the UNAME26 personality set allows a leak of kernel
|
||||
stack contents. This fixes it by defensively calculating the length of
|
||||
copy_to_user() call, making the len argument unsigned, and initializing
|
||||
the stack buffer to zero (now technically unneeded, but hey, overkill).
|
||||
|
||||
CVE-2012-0957
|
||||
|
||||
Reported-by: PaX Team <pageexec@freemail.hu>
|
||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||||
Cc: Andi Kleen <ak@linux.intel.com>
|
||||
Cc: PaX Team <pageexec@freemail.hu>
|
||||
Cc: Brad Spengler <spender@grsecurity.net>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
kernel/sys.c | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/kernel/sys.c b/kernel/sys.c
|
||||
index c5cb5b9..01865c6 100644
|
||||
--- a/kernel/sys.c
|
||||
+++ b/kernel/sys.c
|
||||
@@ -1265,15 +1265,16 @@ DECLARE_RWSEM(uts_sem);
|
||||
* Work around broken programs that cannot handle "Linux 3.0".
|
||||
* Instead we map 3.x to 2.6.40+x, so e.g. 3.0 would be 2.6.40
|
||||
*/
|
||||
-static int override_release(char __user *release, int len)
|
||||
+static int override_release(char __user *release, size_t len)
|
||||
{
|
||||
int ret = 0;
|
||||
- char buf[65];
|
||||
|
||||
if (current->personality & UNAME26) {
|
||||
- char *rest = UTS_RELEASE;
|
||||
+ const char *rest = UTS_RELEASE;
|
||||
+ char buf[65] = { 0 };
|
||||
int ndots = 0;
|
||||
unsigned v;
|
||||
+ size_t copy;
|
||||
|
||||
while (*rest) {
|
||||
if (*rest == '.' && ++ndots >= 3)
|
||||
@@ -1283,8 +1284,9 @@ static int override_release(char __user *release, int len)
|
||||
rest++;
|
||||
}
|
||||
v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
|
||||
- snprintf(buf, len, "2.6.%u%s", v, rest);
|
||||
- ret = copy_to_user(release, buf, len);
|
||||
+ copy = min(sizeof(buf), max_t(size_t, 1, len));
|
||||
+ copy = scnprintf(buf, copy, "2.6.%u%s", v, rest);
|
||||
+ ret = copy_to_user(release, buf, copy + 1);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From: Kees Cook <keescook@chromium.org>
|
||||
Date: Fri, 19 Oct 2012 18:45:53 -0700
|
||||
Subject: [2/2] use clamp_t in UNAME26 fix
|
||||
|
||||
commit 31fd84b95eb211d5db460a1dda85e004800a7b52 upstream.
|
||||
|
||||
The min/max call needed to have explicit types on some architectures
|
||||
(e.g. mn10300). Use clamp_t instead to avoid the warning:
|
||||
|
||||
kernel/sys.c: In function 'override_release':
|
||||
kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]
|
||||
|
||||
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
|
||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
kernel/sys.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kernel/sys.c b/kernel/sys.c
|
||||
index 01865c6..e6e0ece 100644
|
||||
--- a/kernel/sys.c
|
||||
+++ b/kernel/sys.c
|
||||
@@ -1284,7 +1284,7 @@ static int override_release(char __user *release, size_t len)
|
||||
rest++;
|
||||
}
|
||||
v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
|
||||
- copy = min(sizeof(buf), max_t(size_t, 1, len));
|
||||
+ copy = clamp_t(size_t, len, 1, sizeof(buf));
|
||||
copy = scnprintf(buf, copy, "2.6.%u%s", v, rest);
|
||||
ret = copy_to_user(release, buf, copy + 1);
|
||||
}
|
||||
|
|
@ -45,7 +45,4 @@ debian/debugfs-set-default-mode-to-700.patch
|
|||
|
||||
bugfix/alpha/alpha-use-large-data-model.diff
|
||||
bugfix/all/speakup-lower-default-software-speech-rate.patch
|
||||
bugfix/all/SUNRPC-Set-alloc_slot-for-backchannel-tcp-ops.patch
|
||||
debian/iwlwifi-do-not-request-unreleased-firmware.patch
|
||||
bugfix/all/kernel-sys.c-fix-stack-memory-content-leak-via-UNAME.patch
|
||||
bugfix/all/use-clamp_t-in-UNAME26-fix.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue