lkml.org 
[lkml]   [2013]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 034/171 ] drm/i915: restrict kernel address leak in debugfs
    3.6.11.2 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Kees Cook <keescook@chromium.org>

    [ Upstream commit 2563a4524febe8f4a98e717e02436d1aaf672aa2 ]

    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>
    Cc: stable@vger.kernel.org
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
    index 359f6e8..956e9b7 100644
    --- a/drivers/gpu/drm/i915/i915_debugfs.c
    +++ b/drivers/gpu/drm/i915/i915_debugfs.c
    @@ -121,7 +121,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 %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),
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-04-12 02:21    [W:4.267 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site