Commit 5ec931a8 authored by Aaron Ding's avatar Aaron Ding Committed by Daniel Mentz
Browse files

ANDROID: userfaultfd: Fix merge resolution: validate_range()



On the android12-5.10 branch, commit 4a5cf924 ("BACKPORT: FROMGIT:
userfaultfd: add UFFDIO_CONTINUE ioctl") added a new call site for the
function validate_range(). Meanwhile, on the 5.10 stable branch, commit
0b591c02 ("userfaultfd: do not untag user pointers") changed the
function signature of validate_range() and updated all call sites
accordingly. However, since these two commits happened on different
branches, the new call site in userfaultfd_continue() has not been
updated accordingly. This has arguably been missed in the merge commit
ac329b33 ("Merge 5.10.54 into android13-5.10").

This patch fixes the following build breakage

./common/fs/userfaultfd.c:1875:32: error: incompatible pointer to integer conversion passing '__u64 *' (aka 'unsigned long long *') to parameter of type '__u64' (aka 'unsigned long long'); remove & [-Werror,-Wint-conversion]

        ret = validate_range(ctx->mm, &uffdio_continue.range.start,
                                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
./common/fs/userfaultfd.c:1245:14: note: passing argument to parameter 'start' here
                                          __u64 start, __u64 len)
                                                ^
1 error generated.

Fixes: ac329b33 ("Merge 5.10.54 into android13-5.10")
Signed-off-by: default avatarAaron Ding <aaronding@google.com>
Signed-off-by: default avatarDaniel Mentz <danielmentz@google.com>
Change-Id: I7ad40df213897314c439480f22a2ef4712e84025
parent 06fed8b2
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment