mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-08 21:22:09 -04:00
usb: f_fs: Avoid invalid pointer access in ffs_fs_get_tree
Consider a case where ffs_data_new is getting called from ffs_fs_get_tree and ffs_data_new returns error pointer since the function (e.g. adb) is already mounted. The driver is only checking for the NULL return value for ffs but in this case it will not be NULL, which will fail the check and driver will go ahead accessing invalid pointer which can lead to inconsistencies. Fix this by having NULL as well as error pointer check for ffs. Change-Id: Idad5a0b91148325258ea3f545d4da71644c7fc53 Signed-off-by: Pratham Pratap <prathampratap@codeaurora.org>
This commit is contained in:
parent
1da9486979
commit
ba36d54b9a
1 changed files with 7 additions and 2 deletions
|
|
@ -1760,8 +1760,13 @@ static int ffs_fs_get_tree(struct fs_context *fc)
|
|||
return invalf(fc, "No source specified");
|
||||
|
||||
ffs = ffs_data_new(fc->source);
|
||||
if (unlikely(!ffs))
|
||||
return -ENOMEM;
|
||||
if (IS_ERR_OR_NULL(ffs)) {
|
||||
if (!ffs)
|
||||
return -ENOMEM;
|
||||
else
|
||||
return PTR_ERR(ffs);
|
||||
}
|
||||
|
||||
ffs->file_perms = ctx->perms;
|
||||
ffs->no_disconnect = ctx->no_disconnect;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue