From: Greg Kroah-Hartman Date: Tue, 26 Mar 2013 17:21:27 +0000 (-0700) Subject: refresh queue-3.4/drm-i915-restrict-kernel-address-leak-in-debugfs.patch X-Git-Tag: v3.0.71~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=652787c74b2a42091fe614fab9e8da5c54ddc4ac;p=thirdparty%2Fkernel%2Fstable-queue.git refresh queue-3.4/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 index 12e5cde88f0..6bbcbc9bb23 100644 --- 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 @@ -15,16 +15,18 @@ Signed-off-by: Kees Cook Signed-off-by: Daniel Vetter Signed-off-by: Greg Kroah-Hartman -diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c -index aae3148..7299ea4 100644 +--- + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- 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) +@@ -122,7 +122,7 @@ static const char *cache_level_str(int t 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", +- seq_printf(m, "%p: %s%s %8zdKiB %04x %04x %d %d%s%s%s", ++ seq_printf(m, "%pK: %s%s %8zdKiB %04x %04x %d %d%s%s%s", &obj->base, get_pin_flag(obj), get_tiling_flag(obj),