From 1da58ab555464122d39b81411f8cb4a562addd3a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 18:17:12 +0200 Subject: [PATCH] ANDROID: fix up direct access to mmap_sem It's now being abstracted away, so fix up the ANDROID specific code that touches the lock to use the correct functions instead. Signed-off-by: Greg Kroah-Hartman Change-Id: I9cedb62118cd1bba7af27deb11499d312d24d7fc --- drivers/misc/uid_sys_stats.c | 4 ++-- kernel/sys.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/misc/uid_sys_stats.c b/drivers/misc/uid_sys_stats.c index c5d9b5c09585..31d58eaad1b3 100644 --- a/drivers/misc/uid_sys_stats.c +++ b/drivers/misc/uid_sys_stats.c @@ -136,7 +136,7 @@ static void get_full_task_comm(struct task_entry *task_entry, /* next the executable file name */ if (mm) { - down_read(&mm->mmap_sem); + mmap_write_lock(mm); if (mm->exe_file) { char *pathname = d_path(&mm->exe_file->f_path, buf, unused_len); @@ -149,7 +149,7 @@ static void get_full_task_comm(struct task_entry *task_entry, unused_len--; } } - up_read(&mm->mmap_sem); + mmap_write_unlock(mm); } unused_len -= len; diff --git a/kernel/sys.c b/kernel/sys.c index 113955fe1c6b..2450e0fc1181 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2361,7 +2361,7 @@ static int prctl_set_vma_anon_name(unsigned long start, unsigned long end, return error; if (prev) vma = prev->vm_next; - else /* madvise_remove dropped mmap_sem */ + else /* madvise_remove dropped mmap_lock */ vma = find_vma(current->mm, start); } } @@ -2389,7 +2389,7 @@ static int prctl_set_vma(unsigned long opt, unsigned long start, if (end == start) return 0; - down_write(&mm->mmap_sem); + mmap_write_lock(mm); switch (opt) { case PR_SET_VMA_ANON_NAME: @@ -2399,7 +2399,7 @@ static int prctl_set_vma(unsigned long opt, unsigned long start, error = -EINVAL; } - up_write(&mm->mmap_sem); + mmap_write_unlock(mm); return error; }