linux-kernel - Re: [PATCH v3 3/5] firmware: fold successful fw read early

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 4 Jan 2016 15:48:29 -0500
From:	Josh Boyer <jwboyer@...oraproject.org>
To:	"Luis R. Rodriguez" <mcgrof@...not-panic.com>
Cc:	Greg KH <gregkh@...uxfoundation.org>,
	Ming Lei <ming.lei@...onical.com>,
	Johannes Berg <johannes@...solutions.net>,
	Andy Lutomirski <luto@...capital.net>,
	Jonathan Corbet <corbet@....net>,
	David Woodhouse <dwmw2@...radead.org>,
	David Howells <dhowells@...hat.com>,
	Seth Forshee <seth.forshee@...onical.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Michal Marek <mmarek@...e.cz>,
	Matthew Garrett <mjg59@...f.ucam.org>, kyle@...nel.org,
	Mimi Zohar <zohar@...ux.vnet.ibm.com>,
	dmitry.kasatkin@...il.com, Vivek Goyal <vgoyal@...hat.com>,
	Brian Norris <computersforpeace@...il.com>,
	Kees Cook <keescook@...omium.org>, shuahkh@....samsung.com,
	Linus Torvalds <torvalds@...ux-foundation.org>,
	linux-security-module <linux-security-module@...r.kernel.org>,
	keyrings@...ux-nfs.org,
	"Linux-Kernel@...r. Kernel. Org" <linux-kernel@...r.kernel.org>,
	"Luis R . Rodriguez" <mcgrof@...e.com>
Subject: Re: [PATCH v3 3/5] firmware: fold successful fw read early

On Wed, Dec 23, 2015 at 4:34 PM, Luis R. Rodriguez
<mcgrof@...not-panic.com> wrote:
> From: David Howells <dhowells@...hat.com>
>
> We'll be folding in some more checks on fw_read_file_contents(),
> this will make the success case easier to follow.
>
> Signed-off-by: David Howells <dhowells@...hat.com>
> Signed-off-by: Luis R. Rodriguez <mcgrof@...e.com>

Reviewed-by: Josh Boyer <jwboyer@...oraproject.org>

> ---
>  drivers/base/firmware_class.c | 16 +++++++---------
>  1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index d8148aa89b01..e10a5349aa61 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -361,20 +361,18 @@ static int fw_get_filesystem_firmware(struct device *device,
>                         continue;
>                 rc = fw_read_file_contents(file, buf);
>                 fput(file);
> -               if (rc)
> +               if (rc == 0) {
> +                       dev_dbg(device, "system data: direct-loading firmware %s\n",
> +                               buf->fw_id);
> +                       fw_finish_direct_load(device, buf);
> +                       goto out;
> +               } else
>                         dev_warn(device, "system data, attempted to load %s, but failed with error %d\n",
>                                  path, rc);
> -               else
> -                       break;
>         }
> +out:
>         __putname(path);
>
> -       if (!rc) {
> -               dev_dbg(device, "system data: direct-loading firmware %s\n",
> -                       buf->fw_id);
> -               fw_finish_direct_load(device, buf);
> -       }
> -
>         return rc;
>  }
>
> --
> 2.6.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/