From: Greg Kroah-Hartman Date: Wed, 8 Feb 2012 16:39:09 +0000 (-0800) Subject: 3.2-stable patches X-Git-Tag: v3.0.21~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcd5bb135653ec2d3917db54cbe153ec0196b7f8;p=thirdparty%2Fkernel%2Fstable-queue.git 3.2-stable patches added patches: atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch lockdep-bug-exclude-taint_oot_module-from-disabling-lock-debugging.patch --- diff --git a/queue-3.2/atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch b/queue-3.2/atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch new file mode 100644 index 00000000000..d665e76852e --- /dev/null +++ b/queue-3.2/atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch @@ -0,0 +1,33 @@ +From 9f1065032ceb7e86c7c9f16bb86518857e88a172 Mon Sep 17 00:00:00 2001 +From: Hubert Feurstein +Date: Mon, 9 Jan 2012 17:23:57 +0100 +Subject: atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume + +From: Hubert Feurstein + +commit 9f1065032ceb7e86c7c9f16bb86518857e88a172 upstream. + +An error was existing in the saving of CONTRAST_CTR register +across suspend/resume. + +Signed-off-by: Hubert Feurstein +Signed-off-by: Nicolas Ferre +Acked-by: Jean-Christophe PLAGNIOL-VILLARD +Signed-off-by: Florian Tobias Schandinat +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/video/atmel_lcdfb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/atmel_lcdfb.c ++++ b/drivers/video/atmel_lcdfb.c +@@ -1089,7 +1089,7 @@ static int atmel_lcdfb_suspend(struct pl + */ + lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL); + +- sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); ++ sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR); + lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0); + if (sinfo->atmel_lcdfb_power_control) + sinfo->atmel_lcdfb_power_control(0); diff --git a/queue-3.2/cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch b/queue-3.2/cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch new file mode 100644 index 00000000000..f64a22d1bbb --- /dev/null +++ b/queue-3.2/cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch @@ -0,0 +1,44 @@ +From de47a4176c532ef5961b8a46a2d541a3517412d3 Mon Sep 17 00:00:00 2001 +From: Shirish Pargaonkar +Date: Thu, 2 Feb 2012 15:28:28 -0600 +Subject: cifs: Fix oops in session setup code for null user mounts + +From: Shirish Pargaonkar + +commit de47a4176c532ef5961b8a46a2d541a3517412d3 upstream. + +For null user mounts, do not invoke string length function +during session setup. + +Reported-and-Tested-by: Chris Clayton +Acked-by: Jeff Layton +Signed-off-by: Shirish Pargaonkar +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman + +--- + fs/cifs/sess.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/fs/cifs/sess.c ++++ b/fs/cifs/sess.c +@@ -246,16 +246,15 @@ static void ascii_ssetup_strings(char ** + /* copy user */ + /* BB what about null user mounts - check that we do this BB */ + /* copy user */ +- if (ses->user_name != NULL) ++ if (ses->user_name != NULL) { + strncpy(bcc_ptr, ses->user_name, MAX_USERNAME_SIZE); ++ bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE); ++ } + /* else null user mount */ +- +- bcc_ptr += strnlen(ses->user_name, MAX_USERNAME_SIZE); + *bcc_ptr = 0; + bcc_ptr++; /* account for null termination */ + + /* copy domain */ +- + if (ses->domainName != NULL) { + strncpy(bcc_ptr, ses->domainName, 256); + bcc_ptr += strnlen(ses->domainName, 256); diff --git a/queue-3.2/lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch b/queue-3.2/lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch new file mode 100644 index 00000000000..0febc7368c2 --- /dev/null +++ b/queue-3.2/lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch @@ -0,0 +1,53 @@ +From df754e6af2f237a6c020c0daff55a1a609338e31 Mon Sep 17 00:00:00 2001 +From: Peter Zijlstra +Date: Mon, 14 Nov 2011 13:13:49 +0100 +Subject: lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep + +From: Peter Zijlstra + +commit df754e6af2f237a6c020c0daff55a1a609338e31 upstream. + +It's unlikely that TAINT_FIRMWARE_WORKAROUND causes false +lockdep messages, so do not disable lockdep in that case. +We still want to keep lockdep disabled in the +TAINT_OOT_MODULE case: + + - bin-only modules can cause various instabilities in + their and in unrelated kernel code + + - they are impossible to debug for kernel developers + + - they also typically do not have the copyright license + permission to link to the GPL-ed lockdep code. + +Suggested-by: Ben Hutchings +Signed-off-by: Peter Zijlstra +Link: http://lkml.kernel.org/n/tip-xopopjjens57r0i13qnyh2yo@git.kernel.org +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/panic.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -240,8 +240,16 @@ void add_taint(unsigned flag) + * Also we want to keep up lockdep for staging development and + * post-warning case. + */ +- if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off()) +- printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n"); ++ switch (flag) { ++ case TAINT_CRAP: ++ case TAINT_WARN: ++ case TAINT_FIRMWARE_WORKAROUND: ++ break; ++ ++ default: ++ if (__debug_locks_off()) ++ printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n"); ++ } + + set_bit(flag, &tainted_mask); + } diff --git a/queue-3.2/lockdep-bug-exclude-taint_oot_module-from-disabling-lock-debugging.patch b/queue-3.2/lockdep-bug-exclude-taint_oot_module-from-disabling-lock-debugging.patch new file mode 100644 index 00000000000..138320b16be --- /dev/null +++ b/queue-3.2/lockdep-bug-exclude-taint_oot_module-from-disabling-lock-debugging.patch @@ -0,0 +1,53 @@ +From 9ec84acee1e221d99dc33237bff5e82839d10cc0 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 7 Dec 2011 14:30:58 +0000 +Subject: lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging + +From: Ben Hutchings + +commit 9ec84acee1e221d99dc33237bff5e82839d10cc0 upstream. + +We do want to allow lock debugging for GPL-compatible modules +that are not (yet) built in-tree. This was disabled as a +side-effect of commit 2449b8ba0745327c5fa49a8d9acffe03b2eded69 +('module,bug: Add TAINT_OOT_MODULE flag for modules not built +in-tree'). Lock debug warnings now include taint flags, so +kernel developers should still be able to deflect warnings +caused by out-of-tree modules. + +The TAINT_PROPRIETARY_MODULE flag for non-GPL-compatible modules +will still disable lock debugging. + +Signed-off-by: Ben Hutchings +Cc: Nick Bowler +Cc: Dave Jones +Cc: Rusty Russell +Cc: Randy Dunlap +Cc: Debian kernel maintainers +Cc: Peter Zijlstra +Cc: Alan Cox +Link: http://lkml.kernel.org/r/1323268258.18450.11.camel@deadeye +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + kernel/panic.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -237,11 +237,12 @@ void add_taint(unsigned flag) + * Can't trust the integrity of the kernel anymore. + * We don't call directly debug_locks_off() because the issue + * is not necessarily serious enough to set oops_in_progress to 1 +- * Also we want to keep up lockdep for staging development and +- * post-warning case. ++ * Also we want to keep up lockdep for staging/out-of-tree ++ * development and post-warning case. + */ + switch (flag) { + case TAINT_CRAP: ++ case TAINT_OOT_MODULE: + case TAINT_WARN: + case TAINT_FIRMWARE_WORKAROUND: + break; diff --git a/queue-3.2/series b/queue-3.2/series index e94461b49f3..88e9d17bf5f 100644 --- a/queue-3.2/series +++ b/queue-3.2/series @@ -46,3 +46,7 @@ drm-i915-convert-force_wake_get-to-func-pointer-in-the-gpu-reset-code.patch drm-i915-protect-force_wake_-get-put-with-the-gt_lock.patch ecryptfs-infinite-loop-due-to-overflow-in-ecryptfs_write.patch hwmon-w83627ehf-fix-number-of-fans-for-nct6776f.patch +cifs-fix-oops-in-session-setup-code-for-null-user-mounts.patch +atmel_lcdfb-fix-usage-of-contrast_ctr-in-suspend-resume.patch +lockdep-bug-exclude-taint_firmware_workaround-from-disabling-lockdep.patch +lockdep-bug-exclude-taint_oot_module-from-disabling-lock-debugging.patch