[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87fuh4tvb8.fsf@intel.com>
Date: Wed, 19 Apr 2017 15:51:07 +0300
From: Jani Nikula <jani.nikula@...ux.intel.com>
To: Kees Cook <keescook@...omium.org>, linux-kernel@...r.kernel.org
Cc: Mika Kuoppala <mika.kuoppala@...ux.intel.com>,
Daniel Vetter <daniel.vetter@...el.com>,
David Airlie <airlied@...ux.ie>,
intel-gfx@...ts.freedesktop.org, dri-devel@...ts.freedesktop.org
Subject: Re: [PATCH] drm: i915: Avoid format string expansion from engine names
On Tue, 11 Apr 2017, Kees Cook <keescook@...omium.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@...omium.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
Powered by blists - more mailing lists