Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 06:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

firmware_class: Fix the file size check

Browse Source 
We expect to read firmware blobs with a single call to kernel_read(),
which returns int.  Therefore the size must be within the range of
int, not long.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ben Hutchings 2013-12-28 16:53:59 +01:00 committed by Greg Kroah-Hartman
parent 174be70b63
commit 08da2012e0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/base/firmware_class.c
View File

@ -280,21 +280,21 @@ module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644);
MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path"); MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path");
/* Don't inline this: 'struct kstat' is biggish */ /* Don't inline this: 'struct kstat' is biggish */
static noinline_for_stack long fw_file_size(struct file *file) static noinline_for_stack int fw_file_size(struct file *file)
{ {
struct kstat st; struct kstat st;
if (vfs_getattr(&file->f_path, &st)) if (vfs_getattr(&file->f_path, &st))
return -1; return -1;
if (!S_ISREG(st.mode)) if (!S_ISREG(st.mode))
return -1; return -1;
if (st.size != (long)st.size) if (st.size != (int)st.size)
return -1; return -1;
return st.size; return st.size;
} }
static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf)
{ {
long size; int size;
char *buf; char *buf;
int rc; int rc;