* [PATCH] firmware: set firmware_buf size in kernel_read_file_from_path()
@ 2016-02-20 9:14 Sergey Senozhatsky
2016-02-20 9:21 ` Sergey Senozhatsky
2016-02-20 9:22 ` [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware() Sergey Senozhatsky
0 siblings, 2 replies; 7+ messages in thread
From: Sergey Senozhatsky @ 2016-02-20 9:14 UTC (permalink / raw)
To: Ming Lei
Cc: Mimi Zohar, Greg Kroah-Hartman, Kees Cook, linux-kernel,
Sergey Senozhatsky
Set firmware_buf->size in kernel_read_file_from_path(),
otherwise assign_firmware_buf() fails.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
drivers/base/firmware_class.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index b8bc846..7cf41a5 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -335,6 +335,7 @@ static int fw_get_filesystem_firmware(struct device *device,
}
dev_dbg(device, "direct-loading %s\n",
buf->fw_id);
+ buf->size = size;
fw_finish_direct_load(device, buf);
break;
}
--
2.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] firmware: set firmware_buf size in kernel_read_file_from_path()
2016-02-20 9:14 [PATCH] firmware: set firmware_buf size in kernel_read_file_from_path() Sergey Senozhatsky
@ 2016-02-20 9:21 ` Sergey Senozhatsky
2016-02-20 9:22 ` [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware() Sergey Senozhatsky
1 sibling, 0 replies; 7+ messages in thread
From: Sergey Senozhatsky @ 2016-02-20 9:21 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Ming Lei, Mimi Zohar, Greg Kroah-Hartman, Kees Cook, linux-kernel
On (02/20/16 18:14), Sergey Senozhatsky wrote:
> Set firmware_buf->size in kernel_read_file_from_path(),
^^^
ah... sorry, a typo. not "in", but "after".
I'll resend shortly.
-ss
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware()
2016-02-20 9:14 [PATCH] firmware: set firmware_buf size in kernel_read_file_from_path() Sergey Senozhatsky
2016-02-20 9:21 ` Sergey Senozhatsky
@ 2016-02-20 9:22 ` Sergey Senozhatsky
[not found] ` <1456027178.2906.196.camel@linux.vnet.ibm.com>
` (2 more replies)
1 sibling, 3 replies; 7+ messages in thread
From: Sergey Senozhatsky @ 2016-02-20 9:22 UTC (permalink / raw)
To: Ming Lei
Cc: Mimi Zohar, Greg Kroah-Hartman, Kees Cook, linux-kernel,
Sergey Senozhatsky
Set firmware_buf->size in fw_get_filesystem_firmware() after
successful kernel_read_file_from_path(), otherwise assign_firmware_buf()
fails.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
drivers/base/firmware_class.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index b8bc846..7cf41a5 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -335,6 +335,7 @@ static int fw_get_filesystem_firmware(struct device *device,
}
dev_dbg(device, "direct-loading %s\n",
buf->fw_id);
+ buf->size = size;
fw_finish_direct_load(device, buf);
break;
}
--
2.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread[parent not found: <1456027178.2906.196.camel@linux.vnet.ibm.com>]
* Re: [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware()
[not found] ` <1456027178.2906.196.camel@linux.vnet.ibm.com>
@ 2016-02-21 5:01 ` Sergey Senozhatsky
2016-02-21 13:46 ` Mimi Zohar
0 siblings, 1 reply; 7+ messages in thread
From: Sergey Senozhatsky @ 2016-02-21 5:01 UTC (permalink / raw)
To: Mimi Zohar
Cc: Sergey Senozhatsky, Ming Lei, Greg Kroah-Hartman, Kees Cook,
linux-kernel
Hello,
On (02/20/16 22:59), Mimi Zohar wrote:
> On Sat, 2016-02-20 at 18:22 +0900, Sergey Senozhatsky wrote:
> > Set firmware_buf->size in fw_get_filesystem_firmware() after
> > successful kernel_read_file_from_path(), otherwise assign_firmware_buf()
> > fails.
> >
> > Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
> > ---
> > drivers/base/firmware_class.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> > index b8bc846..7cf41a5 100644
> > --- a/drivers/base/firmware_class.c
> > +++ b/drivers/base/firmware_class.c
> > @@ -335,6 +335,7 @@ static int fw_get_filesystem_firmware(struct device *device,
> > }
> > dev_dbg(device, "direct-loading %s\n",
> > buf->fw_id);
> > + buf->size = size;
> > fw_finish_direct_load(device, buf);
> > break;
> > }
>
> Thanks, Sergey.
>
> Somehow this was dropped in v4.
sure, no prob.
if there is a way to fold this small fix into the original patch, then I wouldn't
mind at all to go with this option.
The other thing is that, the dmesg output has changed, and now it keeps the
log of unsuccessful ucode accesses from ->ucode_api_max to ->ucode_api_min:
[ 1.236866] Unable to open file: /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode (-2)
[ 1.236874] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode failed with error -2
[ 1.236889] Unable to open file: /lib/firmware/updates/iwlwifi-7260-17.ucode (-2)
[ 1.236894] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/iwlwifi-7260-17.ucode failed with error -2
[ 1.237064] Unable to open file: /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode (-2)
[ 1.237073] iwlwifi 0000:02:00.0: loading /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode failed with error -2
[ 1.237094] Unable to open file: /lib/firmware/iwlwifi-7260-17.ucode (-2)
[ 1.237099] iwlwifi 0000:02:00.0: loading /lib/firmware/iwlwifi-7260-17.ucode failed with error -2
[ 1.237106] iwlwifi 0000:02:00.0: Direct firmware load for iwlwifi-7260-17.ucode failed with error -2
[ 1.237190] Unable to open file: /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode (-2)
[ 1.237195] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode failed with error -2
[ 1.237201] Unable to open file: /lib/firmware/updates/iwlwifi-7260-16.ucode (-2)
[ 1.237204] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/iwlwifi-7260-16.ucode failed with error -2
[ 1.237217] Unable to open file: /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode (-2)
[ 1.237221] iwlwifi 0000:02:00.0: loading /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode failed with error -2
is this intentional? is there any reason to give this info back to user or
this is just a small regression?
-ss
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware()
2016-02-21 5:01 ` Sergey Senozhatsky
@ 2016-02-21 13:46 ` Mimi Zohar
0 siblings, 0 replies; 7+ messages in thread
From: Mimi Zohar @ 2016-02-21 13:46 UTC (permalink / raw)
To: Sergey Senozhatsky; +Cc: Ming Lei, Greg Kroah-Hartman, Kees Cook, linux-kernel
On Sun, 2016-02-21 at 14:01 +0900, Sergey Senozhatsky wrote:
> Hello,
>
> On (02/20/16 22:59), Mimi Zohar wrote:
> > On Sat, 2016-02-20 at 18:22 +0900, Sergey Senozhatsky wrote:
> > > Set firmware_buf->size in fw_get_filesystem_firmware() after
> > > successful kernel_read_file_from_path(), otherwise assign_firmware_buf()
> > > fails.
> > >
> > > Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
> > > ---
> > > drivers/base/firmware_class.c | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> > > index b8bc846..7cf41a5 100644
> > > --- a/drivers/base/firmware_class.c
> > > +++ b/drivers/base/firmware_class.c
> > > @@ -335,6 +335,7 @@ static int fw_get_filesystem_firmware(struct device *device,
> > > }
> > > dev_dbg(device, "direct-loading %s\n",
> > > buf->fw_id);
> > > + buf->size = size;
> > > fw_finish_direct_load(device, buf);
> > > break;
> > > }
> >
> > Thanks, Sergey.
> >
> > Somehow this was dropped in v4.
>
> sure, no prob.
> if there is a way to fold this small fix into the original patch, then I wouldn't
> mind at all to go with this option.
Will do, thanks.
>
> The other thing is that, the dmesg output has changed, and now it keeps the
> log of unsuccessful ucode accesses from ->ucode_api_max to ->ucode_api_min:
>
> [ 1.236866] Unable to open file: /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode (-2)
> [ 1.236874] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode failed with error -2
> [ 1.236889] Unable to open file: /lib/firmware/updates/iwlwifi-7260-17.ucode (-2)
> [ 1.236894] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/iwlwifi-7260-17.ucode failed with error -2
> [ 1.237064] Unable to open file: /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode (-2)
> [ 1.237073] iwlwifi 0000:02:00.0: loading /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-17.ucode failed with error -2
> [ 1.237094] Unable to open file: /lib/firmware/iwlwifi-7260-17.ucode (-2)
> [ 1.237099] iwlwifi 0000:02:00.0: loading /lib/firmware/iwlwifi-7260-17.ucode failed with error -2
> [ 1.237106] iwlwifi 0000:02:00.0: Direct firmware load for iwlwifi-7260-17.ucode failed with error -2
> [ 1.237190] Unable to open file: /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode (-2)
> [ 1.237195] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode failed with error -2
> [ 1.237201] Unable to open file: /lib/firmware/updates/iwlwifi-7260-16.ucode (-2)
> [ 1.237204] iwlwifi 0000:02:00.0: loading /lib/firmware/updates/iwlwifi-7260-16.ucode failed with error -2
> [ 1.237217] Unable to open file: /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode (-2)
> [ 1.237221] iwlwifi 0000:02:00.0: loading /lib/firmware/4.5.0-rc4-mm1-dbg-00407-g2edf49f-dirty/iwlwifi-7260-16.ucode failed with error -2
>
>
> is this intentional? is there any reason to give this info back to user or
> this is just a small regression?
Thank you for pointing this out. The move from
kernel_read_file_from_fd() to kernel_read_from_path() introduced this
change. Neither function should display errors.
Mimi
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware()
2016-02-20 9:22 ` [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware() Sergey Senozhatsky
[not found] ` <1456027178.2906.196.camel@linux.vnet.ibm.com>
@ 2016-02-21 9:46 ` Ming Lei
2016-02-23 7:20 ` Bjorn Andersson
2 siblings, 0 replies; 7+ messages in thread
From: Ming Lei @ 2016-02-21 9:46 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Mimi Zohar, Greg Kroah-Hartman, Kees Cook, Linux Kernel Mailing List
On Sat, Feb 20, 2016 at 5:22 PM, Sergey Senozhatsky
<sergey.senozhatsky@gmail.com> wrote:
> Set firmware_buf->size in fw_get_filesystem_firmware() after
> successful kernel_read_file_from_path(), otherwise assign_firmware_buf()
> fails.
>
> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Ming Lei <ming.lei@canonical.com>
This patch fixes d29a7309971afb97b21e7(firmware: replace call
to fw_read_file_contents() with kernel version).
thanks,
> ---
> drivers/base/firmware_class.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index b8bc846..7cf41a5 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -335,6 +335,7 @@ static int fw_get_filesystem_firmware(struct device *device,
> }
> dev_dbg(device, "direct-loading %s\n",
> buf->fw_id);
> + buf->size = size;
> fw_finish_direct_load(device, buf);
> break;
> }
> --
> 2.7.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware()
2016-02-20 9:22 ` [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware() Sergey Senozhatsky
[not found] ` <1456027178.2906.196.camel@linux.vnet.ibm.com>
2016-02-21 9:46 ` Ming Lei
@ 2016-02-23 7:20 ` Bjorn Andersson
2 siblings, 0 replies; 7+ messages in thread
From: Bjorn Andersson @ 2016-02-23 7:20 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Ming Lei, Mimi Zohar, Greg Kroah-Hartman, Kees Cook, lkml
On Sat, Feb 20, 2016 at 1:22 AM, Sergey Senozhatsky
<sergey.senozhatsky@gmail.com> wrote:
> Set firmware_buf->size in fw_get_filesystem_firmware() after
> successful kernel_read_file_from_path(), otherwise assign_firmware_buf()
> fails.
>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
> ---
> drivers/base/firmware_class.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
> index b8bc846..7cf41a5 100644
> --- a/drivers/base/firmware_class.c
> +++ b/drivers/base/firmware_class.c
> @@ -335,6 +335,7 @@ static int fw_get_filesystem_firmware(struct device *device,
> }
> dev_dbg(device, "direct-loading %s\n",
> buf->fw_id);
> + buf->size = size;
> fw_finish_direct_load(device, buf);
> break;
> }
> --
> 2.7.1
>
Regards,
Bjorn
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-02-23 7:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-20 9:14 [PATCH] firmware: set firmware_buf size in kernel_read_file_from_path() Sergey Senozhatsky
2016-02-20 9:21 ` Sergey Senozhatsky
2016-02-20 9:22 ` [PATCH] firmware: set firmware_buf size in fw_get_filesystem_firmware() Sergey Senozhatsky
[not found] ` <1456027178.2906.196.camel@linux.vnet.ibm.com>
2016-02-21 5:01 ` Sergey Senozhatsky
2016-02-21 13:46 ` Mimi Zohar
2016-02-21 9:46 ` Ming Lei
2016-02-23 7:20 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).