Merge 5.4-rc1-prelrease into android-mainline

To make the 5.4-rc1 merge easier, merge at a prerelease point in time
before the final release happens.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
Change-Id: If613d657fd0abf9910c5bf3435a745f01b89765e
This commit is contained in:
Greg Kroah-Hartman 2019-10-02 17:58:47 +02:00
commit 94139142d9
702 changed files with 16130 additions and 9903 deletions

View file

@ -2832,8 +2832,6 @@ static int do_new_mount(struct path *path, const char *fstype, int sb_flags,
put_filesystem(type);
return -EINVAL;
}
} else {
subtype = "";
}
}
@ -3058,7 +3056,7 @@ void *copy_mount_options(const void __user * data)
* the remainder of the page.
*/
/* copy_from_user cannot cross TASK_SIZE ! */
size = TASK_SIZE - (unsigned long)data;
size = TASK_SIZE - (unsigned long)untagged_addr(data);
if (size > PAGE_SIZE)
size = PAGE_SIZE;