vmalloc() will fail (very loudly) if we try to allocate zero bytes to
read a zero byte file. Instead report that we successfully read in all
zero bytes.

It's not immediately obvious to me that this is better than returning an
error but it seems better to punt the decision about that to the caller
on the off chance that it's sensible.

Signed-off-by: Mark Brown <broo...@opensource.wolfsonmicro.com>
---
 drivers/base/firmware_class.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 8154145..a14eb92 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -62,6 +62,11 @@ static bool fw_read_file_contents(struct file *file, struct 
firmware *fw)
        char *buf;
 
        size = fw_file_size(file);
+       if (size == 0) {
+               fw->data = NULL;
+               fw->size = 0;
+               return true;
+       }
        if (size < 0)
                return false;
        buf = vmalloc(size);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to