From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992690AbcB0XQO (ORCPT ); Sat, 27 Feb 2016 18:16:14 -0500 Received: from mail.kernel.org ([198.145.29.136]:57990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992461AbcB0XQL (ORCPT ); Sat, 27 Feb 2016 18:16:11 -0500 From: "Luis R. Rodriguez" 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, "Luis R. Rodriguez" Subject: [PATCH] firmware: change kernel read fail to dev_dbg() Date: Sat, 27 Feb 2016 15:16:03 -0800 Message-Id: <1456614963-5455-1-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.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, to let users warn or not warn. For instance request_firmware_direct() does not warn as this can be used for optional firmware as it has no usermode helper fallback. In the future we may want to change this, given everyone is disabling the usermode helper anyway now, but for now keep reporting only as was designed. request_firmware_direct() will continue to not report errors as it was designed not to. Reported-by: Heiner Kallweit Cc: Heiner Kallweit Cc: Mimi Zohar Cc: Kees Cook Signed-off-by: Luis R. Rodriguez --- Note, this is a fix for a small issue reported by Heiner after Mimi's common kernel file loader changes were merged on James tree. I'm following up through James. If this should go through someone else's tree feel free to coordiante accordingly. drivers/base/firmware_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 1cff832ab74e..b1cf4d61ffc9 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -328,7 +328,7 @@ 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", + dev_dbg(device, "loading %s failed with error %d\n", path, rc); continue; } -- 2.7.0