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

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

    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>
    [bwh: Backported to 3.2: the rest of the format string is different]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    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
    @@ -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 %8zd %04x %04x %d %d%s%s%s",
    + seq_printf(m, "%pK: %s%s %8zd %04x %04x %d %d%s%s%s",
    &obj->base,
    get_pin_flag(obj),
    get_tiling_flag(obj),



    \
     
     \ /
      Last update: 2013-03-25 02:41    [W:2.148 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site