drm/i915: Avoid format string expansion from engine names
authorKees Cook <keescook@chromium.org>
Tue, 11 Apr 2017 04:56:30 +0000 (21:56 -0700)
committerJani Nikula <jani.nikula@intel.com>
Wed, 19 Apr 2017 12:49:27 +0000 (15:49 +0300)
While highly unlikely, this makes sure that the string built from
engine names won't be processed as a format string.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170411045630.GA6612@beast
drivers/gpu/drm/i915/intel_hangcheck.c

index dce742243ba665b31f34268f99d779833ee09d3b..9b0ece427bdc8aeeb2eb28745c81bd18066f90c4 100644 (file)
@@ -407,7 +407,7 @@ static void hangcheck_declare_hang(struct drm_i915_private *i915,
                                 "%s, ", engine->name);
        msg[len-2] = '\0';
 
-       return i915_handle_error(i915, hung, msg);
+       return i915_handle_error(i915, hung, "%s", msg);
 }
 
 /*