prctl_set_mm: downgrade mmap_sem to read lock

The commit a3b609ef9f8b ("proc read mm's {arg,env}_{start,end} with mmap
semaphore taken.") added synchronization of reading argument/environment
boundaries under mmap_sem.  Later commit 88aa7cc688d4 ("mm: introduce
arg_lock to protect arg_start|end and env_start|end in mm_struct") avoided
the coarse use of mmap_sem in similar situations.  But there still
remained two places that (mis)use mmap_sem.

get_cmdline should also use arg_lock instead of mmap_sem when it reads the
boundaries.

The second place that should use arg_lock is in prctl_set_mm.  By
protecting the boundaries fields with the arg_lock, we can downgrade
mmap_sem to reader lock (analogous to what we already do in
prctl_set_mm_map).

[[email protected]: coding style fixes]
Link: http://lkml.kernel.org/r/[email protected]
Fixes: 88aa7cc688d4 ("mm: introduce arg_lock to protect arg_start|end and env_start|end in mm_struct")
Signed-off-by: Michal Koutný <[email protected]>
Signed-off-by: Laurent Dufour <[email protected]>
Co-developed-by: Laurent Dufour <[email protected]>
Reviewed-by: Cyrill Gorcunov <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Cc: Yang Shi <[email protected]>
Cc: Mateusz Guzik <[email protected]>
Cc: Kirill Tkhai <[email protected]>
Cc: Konstantin Khlebnikov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/kernel/sys.c b/kernel/sys.c
index 775bf8d18d036df2d33d8872c0a00c9df73b7e26..2969304c29fe3628ca46a2db6ca824588c12f72b 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -2127,9 +2127,15 @@ static int prctl_set_mm(int opt, unsigned long addr,
 
        error = -EINVAL;
 
-       down_write(&mm->mmap_sem);
+       /*
+        * arg_lock protects concurent updates of arg boundaries, we need
+        * mmap_sem for a) concurrent sys_brk, b) finding VMA for addr
+        * validation.
+        */
+       down_read(&mm->mmap_sem);
        vma = find_vma(mm, addr);
 
+       spin_lock(&mm->arg_lock);
        prctl_map.start_code    = mm->start_code;
        prctl_map.end_code      = mm->end_code;
        prctl_map.start_data    = mm->start_data;
@@ -2217,7 +2223,8 @@ static int prctl_set_mm(int opt, unsigned long addr,
 
        error = 0;
 out:
-       up_write(&mm->mmap_sem);
+       spin_unlock(&mm->arg_lock);
+       up_read(&mm->mmap_sem);
        return error;
 }
 

diff --git a/mm/util.c b/mm/util.c
index 91682a2090eeddb046761726eec1e81817c34d15..9834c4ab7d8e86e1ddb5024b28cf1ab2ff2e55a6 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -718,12 +718,12 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
        if (!mm->arg_end)
                goto out_mm;    /* Shh! No looking before we're done */
 
-       down_read(&mm->mmap_sem);
+       spin_lock(&mm->arg_lock);
        arg_start = mm->arg_start;
        arg_end = mm->arg_end;
        env_start = mm->env_start;
        env_end = mm->env_end;
-       up_read(&mm->mmap_sem);
+       spin_unlock(&mm->arg_lock);
 
        len = arg_end - arg_start;