From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 11 Apr 2012 22:26:42 +0000 (-0700)
Subject: 3.2-stable patches
X-Git-Tag: v3.3.2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02e0ff1bf3dec64d1b54216ddfaea60edcd84f12;p=thirdparty%2Fkernel%2Fstable-queue.git

3.2-stable patches

added patches:
	asoc-ak4642-fixup-mute-needs-1-step.patch
	cred-copy_process-should-clear-child-replacement_session_keyring.patch
---

diff --git a/queue-3.2/asoc-ak4642-fixup-mute-needs-1-step.patch b/queue-3.2/asoc-ak4642-fixup-mute-needs-1-step.patch
new file mode 100644
index 00000000000..aeafc6b7ba2
--- /dev/null
+++ b/queue-3.2/asoc-ak4642-fixup-mute-needs-1-step.patch
@@ -0,0 +1,32 @@
+From 1f99e44cf059d2ed43c5a0724fa738b83800f725 Mon Sep 17 00:00:00 2001
+From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Date: Wed, 4 Apr 2012 23:28:01 -0700
+Subject: ASoC: ak4642: fixup: mute needs +1 step
+
+From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+
+commit 1f99e44cf059d2ed43c5a0724fa738b83800f725 upstream.
+
+ak4642 out_tlv is +12.0dB to -115.0 dB, and it supports mute.
+But current settings didn't care +1 step for mute.
+This patch adds it
+
+Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/ak4642.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/ak4642.c
++++ b/sound/soc/codecs/ak4642.c
+@@ -144,7 +144,7 @@
+  * min : 0xFE : -115.0 dB
+  * mute: 0xFF
+  */
+-static const DECLARE_TLV_DB_SCALE(out_tlv, -11500, 50, 1);
++static const DECLARE_TLV_DB_SCALE(out_tlv, -11550, 50, 1);
+ 
+ static const struct snd_kcontrol_new ak4642_snd_controls[] = {
+ 
diff --git a/queue-3.2/cred-copy_process-should-clear-child-replacement_session_keyring.patch b/queue-3.2/cred-copy_process-should-clear-child-replacement_session_keyring.patch
new file mode 100644
index 00000000000..3e02e1cd6ba
--- /dev/null
+++ b/queue-3.2/cred-copy_process-should-clear-child-replacement_session_keyring.patch
@@ -0,0 +1,41 @@
+From 79549c6dfda0603dba9a70a53467ce62d9335c33 Mon Sep 17 00:00:00 2001
+From: Oleg Nesterov <oleg@redhat.com>
+Date: Mon, 9 Apr 2012 21:03:50 +0200
+Subject: cred: copy_process() should clear child->replacement_session_keyring
+
+From: Oleg Nesterov <oleg@redhat.com>
+
+commit 79549c6dfda0603dba9a70a53467ce62d9335c33 upstream.
+
+keyctl_session_to_parent(task) sets ->replacement_session_keyring,
+it should be processed and cleared by key_replace_session_keyring().
+
+However, this task can fork before it notices TIF_NOTIFY_RESUME and
+the new child gets the bogus ->replacement_session_keyring copied by
+dup_task_struct(). This is obviously wrong and, if nothing else, this
+leads to put_cred(already_freed_cred).
+
+change copy_creds() to clear this member. If copy_process() fails
+before this point the wrong ->replacement_session_keyring doesn't
+matter, exit_creds() won't be called.
+
+Signed-off-by: Oleg Nesterov <oleg@redhat.com>
+Acked-by: David Howells <dhowells@redhat.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/cred.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/kernel/cred.c
++++ b/kernel/cred.c
+@@ -385,6 +385,8 @@ int copy_creds(struct task_struct *p, un
+ 	struct cred *new;
+ 	int ret;
+ 
++	p->replacement_session_keyring = NULL;
++
+ 	if (
+ #ifdef CONFIG_KEYS
+ 		!p->cred->thread_keyring &&
diff --git a/queue-3.2/series b/queue-3.2/series
index 55cd97cb891..363cbbb4002 100644
--- a/queue-3.2/series
+++ b/queue-3.2/series
@@ -53,3 +53,5 @@ sched-x86-fix-overflow-in-cyc2ns_offset.patch
 mfd-clear-twl6030-irq-status-register-only-once.patch
 usb-add-motorola-rokr-e6-id-to-the-usbnet-driver-zaurus.patch
 ioat-fix-size-of-completion-for-xen.patch
+asoc-ak4642-fixup-mute-needs-1-step.patch
+cred-copy_process-should-clear-child-replacement_session_keyring.patch