]>
Commit | Line | Data |
---|---|---|
07284d54 GKH |
1 | From 2563a4524febe8f4a98e717e02436d1aaf672aa2 Mon Sep 17 00:00:00 2001 |
2 | From: Kees Cook <keescook@chromium.org> | |
3 | Date: Mon, 11 Mar 2013 12:25:19 -0700 | |
4 | Subject: drm/i915: restrict kernel address leak in debugfs | |
5 | ||
6 | From: Kees Cook <keescook@chromium.org> | |
7 | ||
8 | commit 2563a4524febe8f4a98e717e02436d1aaf672aa2 upstream. | |
9 | ||
10 | Masks kernel address info-leak in object dumps with the %pK suffix, | |
11 | so they cannot be used to target kernel memory corruption attacks if | |
12 | the kptr_restrict sysctl is set. | |
13 | ||
14 | Signed-off-by: Kees Cook <keescook@chromium.org> | |
15 | Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> | |
16 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
17 | ||
f3d353c7 GKH |
18 | --- |
19 | drivers/gpu/drm/i915/i915_debugfs.c | 2 +- | |
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
21 | ||
07284d54 GKH |
22 | --- a/drivers/gpu/drm/i915/i915_debugfs.c |
23 | +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |
f3d353c7 | 24 | @@ -103,7 +103,7 @@ static const char *cache_level_str(int t |
07284d54 GKH |
25 | static void |
26 | describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) | |
27 | { | |
f3d353c7 GKH |
28 | - seq_printf(m, "%p: %s%s %8zdKiB %04x %04x %d %d %d%s%s%s", |
29 | + seq_printf(m, "%pK: %s%s %8zdKiB %04x %04x %d %d %d%s%s%s", | |
07284d54 GKH |
30 | &obj->base, |
31 | get_pin_flag(obj), | |
32 | get_tiling_flag(obj), |