Re: [PATCH] drm: i915: Avoid format string expansion from engine names

From	Jani Nikula <jani.nikula@linux.intel.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH] drm: i915: Avoid format string expansion from engine names
Date	2017-04-19 15:00 +0200
Message-ID	<txXnc-3yQ-23@gated-at.bofh.it> (permalink)
References	<tuW4h-2jb-9@gated-at.bofh.it>
Organization	Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

Show all headers | View raw

On Tue, 11 Apr 2017, Kees Cook <keescook@chromium.org> wrote:
> 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>

Pushed to drm-intel-next-queued, thanks for the patch.

BR,
Jani.

> ---
>  drivers/gpu/drm/i915/intel_hangcheck.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_hangcheck.c b/drivers/gpu/drm/i915/intel_hangcheck.c
> index f05971f5586f..be3550cec8e4 100644
> --- a/drivers/gpu/drm/i915/intel_hangcheck.c
> +++ b/drivers/gpu/drm/i915/intel_hangcheck.c
> @@ -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);
>  }
>  
>  /*
> -- 
> 2.7.4

-- 
Jani Nikula, Intel Open Source Technology Center

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] drm: i915: Avoid format string expansion from engine names Kees Cook <keescook@chromium.org> - 2017-04-11 07:00 +0200
  Re: [PATCH] drm: i915: Avoid format string expansion from engine names Jani Nikula <jani.nikula@linux.intel.com> - 2017-04-19 15:00 +0200

csiph-web