From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f182.google.com ([209.85.223.182]:35194 "EHLO mail-io0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965761AbcBDR0t convert rfc822-to-8bit (ORCPT ); Thu, 4 Feb 2016 12:26:49 -0500 Received: by mail-io0-f182.google.com with SMTP id d63so100574282ioj.2 for ; Thu, 04 Feb 2016 09:26:49 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1454526390-19792-5-git-send-email-zohar@linux.vnet.ibm.com> References: <1454526390-19792-1-git-send-email-zohar@linux.vnet.ibm.com> <1454526390-19792-5-git-send-email-zohar@linux.vnet.ibm.com> Date: Thu, 4 Feb 2016 09:26:48 -0800 Message-ID: Subject: Re: [PATCH v3 04/22] firmware: simplify dev_*() print messages for generic helpers From: Kees Cook To: Mimi Zohar Cc: linux-security-module , "Luis R. Rodriguez" , Kexec Mailing List , linux-modules@vger.kernel.org, "linux-fsdevel@vger.kernel.org" , David Howells , David Woodhouse , Dmitry Torokhov , Dmitry Kasatkin , Eric Biederman , Rusty Russell , "Luis R. Rodriguez" , Andrew Morton , Greg Kroah-Hartman , Casey Schaufler , Ming Lei , Takashi Iwai , =?UTF-8?B?Vm9qdMSbY2ggUGF2bMOtaw==?= , Kyle McMartin , Matthew Garrett , LKML Content-Type: text/plain; charset=UTF-8 Sender: owner-linux-modules@vger.kernel.org List-ID: On Wed, Feb 3, 2016 at 11:06 AM, Mimi Zohar wrote: > From: "Luis R. Rodriguez" > > Simplify a few of the *generic* shared dev_warn() and dev_dbg() > print messages for three reasons: > > 0) Historically firmware_class code was added to help > get device driver firmware binaries but these days > request_firmware*() helpers are being repurposed for > general *system data* needed by the kernel. > > 1) This will also help generalize shared code as much as possible > later in the future in consideration for a new extensible firmware > API which will enable to separate usermode helper code out as much > as possible. > > 2) Kees Cook pointed out the the prints already have the device > associated as dev_*() helpers are used, that should help identify > the user and case in which the helpers are used. That should provide > enough context and simplifies the messages further. > > v4: generalize debug/warn messages even further as suggested by > Kees Cook. > > Cc: Rusty Russell > Cc: Andrew Morton > Cc: Greg Kroah-Hartman > Cc: David Howells > Cc: Kees Cook > Cc: Casey Schaufler > Cc: Ming Lei > Cc: Takashi Iwai > Cc: Vojtěch Pavlík > Cc: Kyle McMartin > Cc: Matthew Garrett > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Luis R. Rodriguez > Signed-off-by: Mimi Zohar Acked-by: Kees Cook -Kees > --- > drivers/base/firmware_class.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c > index 8524450..3358f5d 100644 > --- a/drivers/base/firmware_class.c > +++ b/drivers/base/firmware_class.c > @@ -353,15 +353,15 @@ static int fw_get_filesystem_firmware(struct device *device, > rc = fw_read_file_contents(file, buf); > fput(file); > if (rc) > - dev_warn(device, "firmware, attempted to load %s, but failed with error %d\n", > - path, rc); > + dev_warn(device, "loading %s failed with error %d\n", > + path, rc); > else > break; > } > __putname(path); > > if (!rc) { > - dev_dbg(device, "firmware: direct-loading firmware %s\n", > + dev_dbg(device, "direct-loading %s\n", > buf->fw_id); > mutex_lock(&fw_lock); > set_bit(FW_STATUS_DONE, &buf->status); > @@ -1051,7 +1051,7 @@ _request_firmware_prepare(struct firmware **firmware_p, const char *name, > } > > if (fw_get_builtin_firmware(firmware, name)) { > - dev_dbg(device, "firmware: using built-in firmware %s\n", name); > + dev_dbg(device, "using built-in %s\n", name); > return 0; /* assigned */ > } > > -- > 2.1.0 > -- Kees Cook Chrome OS & Brillo Security From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-io0-x230.google.com ([2607:f8b0:4001:c06::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRNgU-0005lJ-Ga for kexec@lists.infradead.org; Thu, 04 Feb 2016 17:27:11 +0000 Received: by mail-io0-x230.google.com with SMTP id f81so100270948iof.0 for ; Thu, 04 Feb 2016 09:26:49 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1454526390-19792-5-git-send-email-zohar@linux.vnet.ibm.com> References: <1454526390-19792-1-git-send-email-zohar@linux.vnet.ibm.com> <1454526390-19792-5-git-send-email-zohar@linux.vnet.ibm.com> Date: Thu, 4 Feb 2016 09:26:48 -0800 Message-ID: Subject: Re: [PATCH v3 04/22] firmware: simplify dev_*() print messages for generic helpers From: Kees Cook List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Mimi Zohar Cc: Matthew Garrett , Kyle McMartin , Rusty Russell , "linux-fsdevel@vger.kernel.org" , Takashi Iwai , Dmitry Kasatkin , "Luis R. Rodriguez" , Dmitry Torokhov , Kexec Mailing List , "Luis R. Rodriguez" , LKML , David Howells , linux-security-module , =?UTF-8?B?Vm9qdMSbY2ggUGF2bMOtaw==?= , Eric Biederman , Greg Kroah-Hartman , Casey Schaufler , Andrew Morton , David Woodhouse , Ming Lei , linux-modules@vger.kernel.org T24gV2VkLCBGZWIgMywgMjAxNiBhdCAxMTowNiBBTSwgTWltaSBab2hhciA8em9oYXJAbGludXgu dm5ldC5pYm0uY29tPiB3cm90ZToKPiBGcm9tOiAiTHVpcyBSLiBSb2RyaWd1ZXoiIDxtY2dyb2ZA a2VybmVsLm9yZz4KPgo+IFNpbXBsaWZ5IGEgZmV3IG9mIHRoZSAqZ2VuZXJpYyogc2hhcmVkIGRl dl93YXJuKCkgYW5kIGRldl9kYmcoKQo+IHByaW50IG1lc3NhZ2VzIGZvciB0aHJlZSByZWFzb25z Ogo+Cj4gMCkgSGlzdG9yaWNhbGx5IGZpcm13YXJlX2NsYXNzIGNvZGUgd2FzIGFkZGVkIHRvIGhl bHAKPiAgICBnZXQgZGV2aWNlIGRyaXZlciBmaXJtd2FyZSBiaW5hcmllcyBidXQgdGhlc2UgZGF5 cwo+ICAgIHJlcXVlc3RfZmlybXdhcmUqKCkgaGVscGVycyBhcmUgYmVpbmcgcmVwdXJwb3NlZCBm b3IKPiAgICBnZW5lcmFsICpzeXN0ZW0gZGF0YSogbmVlZGVkIGJ5IHRoZSBrZXJuZWwuCj4KPiAx KSBUaGlzIHdpbGwgYWxzbyBoZWxwIGdlbmVyYWxpemUgc2hhcmVkIGNvZGUgYXMgbXVjaCBhcyBw b3NzaWJsZQo+ICAgIGxhdGVyIGluIHRoZSBmdXR1cmUgaW4gY29uc2lkZXJhdGlvbiBmb3IgYSBu ZXcgZXh0ZW5zaWJsZSBmaXJtd2FyZQo+ICAgIEFQSSB3aGljaCB3aWxsIGVuYWJsZSB0byBzZXBh cmF0ZSB1c2VybW9kZSBoZWxwZXIgY29kZSBvdXQgYXMgbXVjaAo+ICAgIGFzIHBvc3NpYmxlLgo+ Cj4gMikgS2VlcyBDb29rIHBvaW50ZWQgb3V0IHRoZSB0aGUgcHJpbnRzIGFscmVhZHkgaGF2ZSB0 aGUgZGV2aWNlCj4gICAgYXNzb2NpYXRlZCBhcyBkZXZfKigpIGhlbHBlcnMgYXJlIHVzZWQsIHRo YXQgc2hvdWxkIGhlbHAgaWRlbnRpZnkKPiAgICB0aGUgdXNlciBhbmQgY2FzZSBpbiB3aGljaCB0 aGUgaGVscGVycyBhcmUgdXNlZC4gVGhhdCBzaG91bGQgcHJvdmlkZQo+ICAgIGVub3VnaCBjb250 ZXh0IGFuZCBzaW1wbGlmaWVzIHRoZSBtZXNzYWdlcyBmdXJ0aGVyLgo+Cj4gdjQ6IGdlbmVyYWxp emUgZGVidWcvd2FybiBtZXNzYWdlcyBldmVuIGZ1cnRoZXIgYXMgc3VnZ2VzdGVkIGJ5Cj4gICAg IEtlZXMgQ29vay4KPgo+IENjOiBSdXN0eSBSdXNzZWxsIDxydXN0eUBydXN0Y29ycC5jb20uYXU+ Cj4gQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgtZm91bmRhdGlvbi5vcmc+Cj4gQ2M6IEdy ZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+Cj4gQ2M6IERhdmlk IEhvd2VsbHMgPGRob3dlbGxzQHJlZGhhdC5jb20+Cj4gQ2M6IEtlZXMgQ29vayA8a2Vlc2Nvb2tA Y2hyb21pdW0ub3JnPgo+IENjOiBDYXNleSBTY2hhdWZsZXIgPGNhc2V5QHNjaGF1Zmxlci1jYS5j b20+Cj4gQ2M6IE1pbmcgTGVpIDxtaW5nLmxlaUBjYW5vbmljYWwuY29tPgo+IENjOiBUYWthc2hp IEl3YWkgPHRpd2FpQHN1c2UuZGU+Cj4gQ2M6IFZvanTEm2NoIFBhdmzDrWsgPHZvanRlY2hAc3Vz ZS5jej4KPiBDYzogS3lsZSBNY01hcnRpbiA8a3lsZUBrZXJuZWwub3JnPgo+IENjOiBNYXR0aGV3 IEdhcnJldHQgPG1qZzU5QHNyY2YudWNhbS5vcmc+Cj4gQ2M6IGxpbnV4LWtlcm5lbEB2Z2VyLmtl cm5lbC5vcmcKPiBTaWduZWQtb2ZmLWJ5OiBMdWlzIFIuIFJvZHJpZ3VleiA8bWNncm9mQGtlcm5l bC5vcmc+Cj4gU2lnbmVkLW9mZi1ieTogTWltaSBab2hhciA8em9oYXJAbGludXgudm5ldC5pYm0u Y29tPgoKQWNrZWQtYnk6IEtlZXMgQ29vayA8a2Vlc2Nvb2tAY2hyb21pdW0ub3JnPgoKLUtlZXMK Cj4gLS0tCj4gIGRyaXZlcnMvYmFzZS9maXJtd2FyZV9jbGFzcy5jIHwgOCArKysrLS0tLQo+ICAx IGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvYmFzZS9maXJtd2FyZV9jbGFzcy5jIGIvZHJpdmVycy9iYXNlL2Zpcm13 YXJlX2NsYXNzLmMKPiBpbmRleCA4NTI0NDUwLi4zMzU4ZjVkIDEwMDY0NAo+IC0tLSBhL2RyaXZl cnMvYmFzZS9maXJtd2FyZV9jbGFzcy5jCj4gKysrIGIvZHJpdmVycy9iYXNlL2Zpcm13YXJlX2Ns YXNzLmMKPiBAQCAtMzUzLDE1ICszNTMsMTUgQEAgc3RhdGljIGludCBmd19nZXRfZmlsZXN5c3Rl bV9maXJtd2FyZShzdHJ1Y3QgZGV2aWNlICpkZXZpY2UsCj4gICAgICAgICAgICAgICAgIHJjID0g ZndfcmVhZF9maWxlX2NvbnRlbnRzKGZpbGUsIGJ1Zik7Cj4gICAgICAgICAgICAgICAgIGZwdXQo ZmlsZSk7Cj4gICAgICAgICAgICAgICAgIGlmIChyYykKPiAtICAgICAgICAgICAgICAgICAgICAg ICBkZXZfd2FybihkZXZpY2UsICJmaXJtd2FyZSwgYXR0ZW1wdGVkIHRvIGxvYWQgJXMsIGJ1dCBm YWlsZWQgd2l0aCBlcnJvciAlZFxuIiwKPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBhdGgsIHJjKTsKPiArICAgICAgICAgICAgICAgICAgICAgICBkZXZfd2FybihkZXZpY2UsICJs b2FkaW5nICVzIGZhaWxlZCB3aXRoIGVycm9yICVkXG4iLAo+ICsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHBhdGgsIHJjKTsKPiAgICAgICAgICAgICAgICAgZWxzZQo+ICAgICAgICAg ICAgICAgICAgICAgICAgIGJyZWFrOwo+ICAgICAgICAgfQo+ICAgICAgICAgX19wdXRuYW1lKHBh dGgpOwo+Cj4gICAgICAgICBpZiAoIXJjKSB7Cj4gLSAgICAgICAgICAgICAgIGRldl9kYmcoZGV2 aWNlLCAiZmlybXdhcmU6IGRpcmVjdC1sb2FkaW5nIGZpcm13YXJlICVzXG4iLAo+ICsgICAgICAg ICAgICAgICBkZXZfZGJnKGRldmljZSwgImRpcmVjdC1sb2FkaW5nICVzXG4iLAo+ICAgICAgICAg ICAgICAgICAgICAgICAgIGJ1Zi0+ZndfaWQpOwo+ICAgICAgICAgICAgICAgICBtdXRleF9sb2Nr KCZmd19sb2NrKTsKPiAgICAgICAgICAgICAgICAgc2V0X2JpdChGV19TVEFUVVNfRE9ORSwgJmJ1 Zi0+c3RhdHVzKTsKPiBAQCAtMTA1MSw3ICsxMDUxLDcgQEAgX3JlcXVlc3RfZmlybXdhcmVfcHJl cGFyZShzdHJ1Y3QgZmlybXdhcmUgKipmaXJtd2FyZV9wLCBjb25zdCBjaGFyICpuYW1lLAo+ICAg ICAgICAgfQo+Cj4gICAgICAgICBpZiAoZndfZ2V0X2J1aWx0aW5fZmlybXdhcmUoZmlybXdhcmUs IG5hbWUpKSB7Cj4gLSAgICAgICAgICAgICAgIGRldl9kYmcoZGV2aWNlLCAiZmlybXdhcmU6IHVz aW5nIGJ1aWx0LWluIGZpcm13YXJlICVzXG4iLCBuYW1lKTsKPiArICAgICAgICAgICAgICAgZGV2 X2RiZyhkZXZpY2UsICJ1c2luZyBidWlsdC1pbiAlc1xuIiwgbmFtZSk7Cj4gICAgICAgICAgICAg ICAgIHJldHVybiAwOyAvKiBhc3NpZ25lZCAqLwo+ICAgICAgICAgfQo+Cj4gLS0KPiAyLjEuMAo+ CgoKCi0tIApLZWVzIENvb2sKQ2hyb21lIE9TICYgQnJpbGxvIFNlY3VyaXR5CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwprZXhlYyBtYWlsaW5nIGxpc3QK a2V4ZWNAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWls bWFuL2xpc3RpbmZvL2tleGVjCg==