3.4-stable patches

added patches:
	drm-i915-restrict-kernel-address-leak-in-debugfs.patch

diff --git a/queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch b/queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch
new file mode 100644 (file)
index 0000000..12e5cde
--- /dev/null
+++ b/queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch
@@ -0,0 +1,30 @@
+From 2563a4524febe8f4a98e717e02436d1aaf672aa2 Mon Sep 17 00:00:00 2001
+From: Kees Cook <keescook@chromium.org>
+Date: Mon, 11 Mar 2013 12:25:19 -0700
+Subject: drm/i915: restrict kernel address leak in debugfs
+
+From: Kees Cook <keescook@chromium.org>
+
+commit 2563a4524febe8f4a98e717e02436d1aaf672aa2 upstream.
+
+Masks kernel address info-leak in object dumps with the %pK suffix,
+so they cannot be used to target kernel memory corruption attacks if
+the kptr_restrict sysctl is set.
+
+Signed-off-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
+index aae3148..7299ea4 100644
+--- a/drivers/gpu/drm/i915/i915_debugfs.c
++++ b/drivers/gpu/drm/i915/i915_debugfs.c
+@@ -103,7 +103,7 @@ static const char *cache_level_str(int type)
+ static void
+ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
+ {
+-      seq_printf(m, "%p: %s%s %8zdKiB %02x %02x %d %d %d%s%s%s",
++      seq_printf(m, "%pK: %s%s %8zdKiB %02x %02x %d %d %d%s%s%s",
+                  &obj->base,
+                  get_pin_flag(obj),
+                  get_tiling_flag(obj),

diff --git a/queue-3.4/series b/queue-3.4/series
index edb873b060a809c0e787421f25a95f6f6f864505..2fa36e62c930e38c3c9a8be0acb54d06a37aa7e8 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -32,3 +32,4 @@ alsa-hda-cirrus-fix-the-digital-beep-registration.patch
 alsa-hda-fix-typo-in-checking-iec958-emphasis-bit.patch
 alsa-snd-usb-mixer-propagate-errors-up-the-call-chain.patch
 alsa-snd-usb-mixer-ignore-einval-in-snd_usb_mixer_controls.patch
+drm-i915-restrict-kernel-address-leak-in-debugfs.patch