diff --git a/debian/changelog b/debian/changelog index be269e7e0..91f37b2e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/patches/bugfix/all/SUNRPC-Set-alloc_slot-for-backchannel-tcp-ops.patch b/debian/patches/bugfix/all/SUNRPC-Set-alloc_slot-for-backchannel-tcp-ops.patch deleted file mode 100644 index f39dd1ca5..000000000 --- a/debian/patches/bugfix/all/SUNRPC-Set-alloc_slot-for-backchannel-tcp-ops.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Bryan Schumaker -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: - [] ? xprt_reserve+0x47/0x50 [sunrpc] - [] call_reserve+0x34/0x60 [sunrpc] - [] __rpc_execute+0x90/0x400 [sunrpc] - [] rpc_async_schedule+0x2a/0x40 [sunrpc] - [] process_one_work+0x139/0x500 - [] ? alloc_worker+0x70/0x70 - [] ? __rpc_execute+0x400/0x400 [sunrpc] - [] worker_thread+0x15e/0x460 - [] ? preempt_schedule+0x49/0x70 - [] ? rescuer_thread+0x230/0x230 - [] kthread+0x93/0xa0 - [] kernel_thread_helper+0x4/0x10 - [] ? kthread_freezable_should_stop+0x70/0x70 - [] ? gs_change+0x13/0x13 - -Signed-off-by: Bryan Schumaker -Signed-off-by: Trond Myklebust ---- - 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, diff --git a/debian/patches/bugfix/all/kernel-sys.c-fix-stack-memory-content-leak-via-UNAME.patch b/debian/patches/bugfix/all/kernel-sys.c-fix-stack-memory-content-leak-via-UNAME.patch deleted file mode 100644 index a8a86de0c..000000000 --- a/debian/patches/bugfix/all/kernel-sys.c-fix-stack-memory-content-leak-via-UNAME.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Kees Cook -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 -Signed-off-by: Kees Cook -Cc: Andi Kleen -Cc: PaX Team -Cc: Brad Spengler -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds ---- - 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; - } diff --git a/debian/patches/bugfix/all/use-clamp_t-in-UNAME26-fix.patch b/debian/patches/bugfix/all/use-clamp_t-in-UNAME26-fix.patch deleted file mode 100644 index 0f60973f9..000000000 --- a/debian/patches/bugfix/all/use-clamp_t-in-UNAME26-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Kees Cook -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 -Signed-off-by: Kees Cook -Signed-off-by: Linus Torvalds ---- - 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); - } diff --git a/debian/patches/series b/debian/patches/series index 4301211c5..685419f38 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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