From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm: i915: Avoid format string expansion from engine names Date: Wed, 19 Apr 2017 15:51:07 +0300 Message-ID: <87fuh4tvb8.fsf@intel.com> References: <20170411045630.GA6612@beast> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170411045630.GA6612@beast> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Kees Cook , linux-kernel@vger.kernel.org Cc: Mika Kuoppala , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAxMSBBcHIgMjAxNywgS2VlcyBDb29rIDxrZWVzY29va0BjaHJvbWl1bS5vcmc+IHdy b3RlOgo+IFdoaWxlIGhpZ2hseSB1bmxpa2VseSwgdGhpcyBtYWtlcyBzdXJlIHRoYXQgdGhlIHN0 cmluZyBidWlsdCBmcm9tCj4gZW5naW5lIG5hbWVzIHdvbid0IGJlIHByb2Nlc3NlZCBhcyBhIGZv cm1hdCBzdHJpbmcuCj4KPiBTaWduZWQtb2ZmLWJ5OiBLZWVzIENvb2sgPGtlZXNjb29rQGNocm9t aXVtLm9yZz4KClB1c2hlZCB0byBkcm0taW50ZWwtbmV4dC1xdWV1ZWQsIHRoYW5rcyBmb3IgdGhl IHBhdGNoLgoKQlIsCkphbmkuCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o YW5nY2hlY2suYyB8IDIgKy0KPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRl bGV0aW9uKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGFu Z2NoZWNrLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oYW5nY2hlY2suYwo+IGluZGV4 IGYwNTk3MWY1NTg2Zi4uYmUzNTUwY2VjOGU0IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2hhbmdjaGVjay5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaGFuZ2NoZWNrLmMKPiBAQCAtNDA3LDcgKzQwNyw3IEBAIHN0YXRpYyB2b2lkIGhhbmdjaGVj a19kZWNsYXJlX2hhbmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCj4gIAkJCQkgIiVz LCAiLCBlbmdpbmUtPm5hbWUpOwo+ICAJbXNnW2xlbi0yXSA9ICdcMCc7Cj4gIAo+IC0JcmV0dXJu IGk5MTVfaGFuZGxlX2Vycm9yKGk5MTUsIGh1bmcsIG1zZyk7Cj4gKwlyZXR1cm4gaTkxNV9oYW5k bGVfZXJyb3IoaTkxNSwgaHVuZywgIiVzIiwgbXNnKTsKPiAgfQo+ICAKPiAgLyoKPiAtLSAKPiAy LjcuNAoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRl cgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934099AbdDSMvN (ORCPT ); Wed, 19 Apr 2017 08:51:13 -0400 Received: from mga02.intel.com ([134.134.136.20]:27721 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934084AbdDSMvM (ORCPT ); Wed, 19 Apr 2017 08:51:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,221,1488873600"; d="scan'208";a="847614063" From: Jani Nikula To: Kees Cook , linux-kernel@vger.kernel.org Cc: Mika Kuoppala , Daniel Vetter , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm: i915: Avoid format string expansion from engine names In-Reply-To: <20170411045630.GA6612@beast> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20170411045630.GA6612@beast> Date: Wed, 19 Apr 2017 15:51:07 +0300 Message-ID: <87fuh4tvb8.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 11 Apr 2017, Kees Cook 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 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