Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1620901 > unrolled thread
| Started by | Kees Cook <keescook@chromium.org> |
|---|---|
| First post | 2017-04-11 07:00 +0200 |
| Last post | 2017-04-19 15:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[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
| From | Kees Cook <keescook@chromium.org> |
|---|---|
| Date | 2017-04-11 07:00 +0200 |
| Subject | [PATCH] drm: i915: Avoid format string expansion from engine names |
| Message-ID | <tuW4h-2jb-9@gated-at.bofh.it> |
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> --- 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 -- Kees Cook Pixel Security
[toc] | [next] | [standalone]
| From | Jani Nikula <jani.nikula@linux.intel.com> |
|---|---|
| Date | 2017-04-19 15:00 +0200 |
| Message-ID | <txXnc-3yQ-23@gated-at.bofh.it> |
| In reply to | #1620901 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web