From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kees Cook Subject: [PATCH] drm: i915: Avoid format string expansion from engine names Date: Mon, 10 Apr 2017 21:56:30 -0700 Message-ID: <20170411045630.GA6612@beast> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: linux-kernel@vger.kernel.org Cc: David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org V2hpbGUgaGlnaGx5IHVubGlrZWx5LCB0aGlzIG1ha2VzIHN1cmUgdGhhdCB0aGUgc3RyaW5nIGJ1 aWx0IGZyb20KZW5naW5lIG5hbWVzIHdvbid0IGJlIHByb2Nlc3NlZCBhcyBhIGZvcm1hdCBzdHJp bmcuCgpTaWduZWQtb2ZmLWJ5OiBLZWVzIENvb2sgPGtlZXNjb29rQGNocm9taXVtLm9yZz4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oYW5nY2hlY2suYyB8IDIgKy0KIDEgZmlsZSBj aGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hhbmdjaGVjay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfaGFuZ2NoZWNrLmMKaW5kZXggZjA1OTcxZjU1ODZmLi5iZTM1NTBjZWM4ZTQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hhbmdjaGVjay5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2hhbmdjaGVjay5jCkBAIC00MDcsNyArNDA3LDcgQEAgc3Rh dGljIHZvaWQgaGFuZ2NoZWNrX2RlY2xhcmVfaGFuZyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq aTkxNSwKIAkJCQkgIiVzLCAiLCBlbmdpbmUtPm5hbWUpOwogCW1zZ1tsZW4tMl0gPSAnXDAnOwog Ci0JcmV0dXJuIGk5MTVfaGFuZGxlX2Vycm9yKGk5MTUsIGh1bmcsIG1zZyk7CisJcmV0dXJuIGk5 MTVfaGFuZGxlX2Vycm9yKGk5MTUsIGh1bmcsICIlcyIsIG1zZyk7CiB9CiAKIC8qCi0tIAoyLjcu NAoKCi0tIApLZWVzIENvb2sKUGl4ZWwgU2VjdXJpdHkKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753326AbdDKE4d (ORCPT ); Tue, 11 Apr 2017 00:56:33 -0400 Received: from mail-pg0-f41.google.com ([74.125.83.41]:33395 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752099AbdDKE4c (ORCPT ); Tue, 11 Apr 2017 00:56:32 -0400 Date: Mon, 10 Apr 2017 21:56:30 -0700 From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Mika Kuoppala , Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm: i915: Avoid format string expansion from engine names Message-ID: <20170411045630.GA6612@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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