summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-04 09:19:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-04 09:19:02 -0700
commitce57e981f2b996aaca2031003b3f866368307766 (patch)
tree7ab6b29e6b0013519f3418bbaf8f661e064861ba /drivers/base
parente1cc485262846dcad931bf85ee655cbbb815bfe6 (diff)
firmware: use 'kernel_read()' to read firmware into kernel buffer
Fengguang correctly points out that the firmware reading should not use vfs_read(), since the buffer is in kernel space. The vfs_read() just happened to work for kernel threads, but sparse warns about the incorrect address spaces, and it's definitely incorrect and could fail for other users of the firmware loading. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/firmware_class.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index e85763de928f..81541452887b 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -58,7 +58,6 @@ static noinline long fw_file_size(struct file *file)
static bool fw_read_file_contents(struct file *file, struct firmware *fw)
{
- loff_t pos;
long size;
char *buf;
@@ -68,8 +67,7 @@ static bool fw_read_file_contents(struct file *file, struct firmware *fw)
buf = vmalloc(size);
if (!buf)
return false;
- pos = 0;
- if (vfs_read(file, buf, size, &pos) != size) {
+ if (kernel_read(file, 0, buf, size) != size) {
vfree(buf);
return false;
}