UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

firmware: check for file truncation on direct firmware loading 

When direct firmware loading is used we iterate over a list
of possible firmware paths and concatenate the desired firmware
name with each path and look for the file there. Should the
passed firmware name be too long we end up truncating the
file we want to look for, the search however is still done.
Add a check for truncation instead of looking for a
truncated firmware filename.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: David Howells <dhowells@redhat.com>
Cc: Kyle McMartin <kyle@kernel.org>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Luis R. Rodriguez 2015-05-12 14:49:41 -07:00 committed by Greg Kroah-Hartman
parent f5727b05d2
commit 1ba4de17e0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/firmware_class.c
View File

@ -320,7 +320,7 @@ fail:
static int fw_get_filesystem_firmware(struct device *device, static int fw_get_filesystem_firmware(struct device *device,
struct firmware_buf *buf) struct firmware_buf *buf)
{ {
int i; int i, len;
int rc = -ENOENT; int rc = -ENOENT;
char *path; char *path;
@ -335,7 +335,12 @@ static int fw_get_filesystem_firmware(struct device *device,
if (!fw_path[i][0]) if (!fw_path[i][0])
continue; continue;
snprintf(path, PATH_MAX, "%s/%s", fw_path[i], buf->fw_id); len = snprintf(path, PATH_MAX, "%s/%s",
fw_path[i], buf->fw_id);
if (len >= PATH_MAX) {
rc = -ENAMETOOLONG;
break;
}
file = filp_open(path, O_RDONLY, 0); file = filp_open(path, O_RDONLY, 0);
if (IS_ERR(file)) if (IS_ERR(file))