From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: jmorris@namei.org, ming.lei@canonical.com, zohar@linux.vnet.ibm.com
Cc: gregkh@linuxfoundation.org, keescook@chromium.org,
linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org, hkallweit1@gmail.com,
nhorman@tuxdriver.com, "Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [PATCH v2] firmware: change kernel read fail to dev_dbg()
Date: Sun, 28 Feb 2016 13:01:31 -0800 [thread overview]
Message-ID: <1456693291-8897-1-git-send-email-mcgrof@kernel.org> (raw)
In-Reply-To: <1456614963-5455-1-git-send-email-mcgrof@kernel.org>
When we now use the new kernel_read_file_from_path() we
are reporting a failure when we iterate over all the paths
possible for firmware. Before using kernel_read_file_from_path()
we only reported a failure once we confirmed a file existed
with filp_open() but failed with fw_read_file_contents().
With kernel_read_file_from_path() both are done for us and
we obviously are now reporting too much information given that
some optional paths will always fail and clutter the logs.
fw_get_filesystem_firmware() already has a check for failure
and uses an internal flag, FW_OPT_NO_WARN, but this does not
let us capture other unxpected errors. This enables that
as changed by Neil via commit:
"firmware: Be a bit more verbose about direct firmware loading failure"
Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
drivers/base/firmware_class.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 1cff832ab74e..9503a88b189b 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -328,8 +328,12 @@ static int fw_get_filesystem_firmware(struct device *device,
rc = kernel_read_file_from_path(path, &buf->data, &size,
INT_MAX, READING_FIRMWARE);
if (rc) {
- dev_warn(device, "loading %s failed with error %d\n",
- path, rc);
+ if (rc == -ENOENT)
+ dev_dbg(device, "loading %s failed with error %d\n",
+ path, rc);
+ else
+ dev_warn(device, "loading %s failed with error %d\n",
+ path, rc);
continue;
}
dev_dbg(device, "direct-loading %s\n", buf->fw_id);
--
2.7.0
prev parent reply other threads:[~2016-02-28 21:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 23:16 [PATCH] firmware: change kernel read fail to dev_dbg() Luis R. Rodriguez
2016-02-28 20:58 ` Luis R. Rodriguez
2016-02-28 21:01 ` Luis R. Rodriguez [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456693291-8897-1-git-send-email-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=jmorris@namei.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=ming.lei@canonical.com \
--cc=nhorman@tuxdriver.com \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox