diff options
author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-06-13 11:09:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-08 18:27:04 -0400 |
commit | 6af6b163b3191bd2802868f17d4843c58bc4046f (patch) | |
tree | 7e5c23b2698550828906ea98ca5c1e25e4025020 /drivers/base/firmware_class.c | |
parent | 5a1379e8748a5cfa3eb068f812d61bde849ef76c (diff) |
firmware: read firmware size using i_size_read()
There is no need to read attr because inode structure contains size
of the file. Use i_size_read() instead.
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Acked-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_class.c')
-rw-r--r-- | drivers/base/firmware_class.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 46ea5f4c3bb5..304691c5e2bc 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
@@ -284,26 +284,15 @@ static const char * const fw_path[] = { | |||
284 | module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644); | 284 | module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644); |
285 | MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path"); | 285 | MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path"); |
286 | 286 | ||
287 | /* Don't inline this: 'struct kstat' is biggish */ | ||
288 | static noinline_for_stack int fw_file_size(struct file *file) | ||
289 | { | ||
290 | struct kstat st; | ||
291 | if (vfs_getattr(&file->f_path, &st)) | ||
292 | return -1; | ||
293 | if (!S_ISREG(st.mode)) | ||
294 | return -1; | ||
295 | if (st.size != (int)st.size) | ||
296 | return -1; | ||
297 | return st.size; | ||
298 | } | ||
299 | |||
300 | static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) | 287 | static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) |
301 | { | 288 | { |
302 | int size; | 289 | int size; |
303 | char *buf; | 290 | char *buf; |
304 | int rc; | 291 | int rc; |
305 | 292 | ||
306 | size = fw_file_size(file); | 293 | if (!S_ISREG(file_inode(file)->i_mode)) |
294 | return -EINVAL; | ||
295 | size = i_size_read(file_inode(file)); | ||
307 | if (size <= 0) | 296 | if (size <= 0) |
308 | return -EINVAL; | 297 | return -EINVAL; |
309 | buf = vmalloc(size); | 298 | buf = vmalloc(size); |