Skip to content

Commit 1bcd236

Browse files
surenbaghdasaryangregkh
authored andcommitted
mm: fix a UAF when vma->mm is freed after vma->vm_refcnt got dropped
commit 9bbffee upstream. By inducing delays in the right places, Jann Horn created a reproducer for a hard to hit UAF issue that became possible after VMAs were allowed to be recycled by adding SLAB_TYPESAFE_BY_RCU to their cache. Race description is borrowed from Jann's discovery report: lock_vma_under_rcu() looks up a VMA locklessly with mas_walk() under rcu_read_lock(). At that point, the VMA may be concurrently freed, and it can be recycled by another process. vma_start_read() then increments the vma->vm_refcnt (if it is in an acceptable range), and if this succeeds, vma_start_read() can return a recycled VMA. In this scenario where the VMA has been recycled, lock_vma_under_rcu() will then detect the mismatching ->vm_mm pointer and drop the VMA through vma_end_read(), which calls vma_refcount_put(). vma_refcount_put() drops the refcount and then calls rcuwait_wake_up() using a copy of vma->vm_mm. This is wrong: It implicitly assumes that the caller is keeping the VMA's mm alive, but in this scenario the caller has no relation to the VMA's mm, so the rcuwait_wake_up() can cause UAF. The diagram depicting the race: T1 T2 T3 == == == lock_vma_under_rcu mas_walk <VMA gets removed from mm> mmap <the same VMA is reallocated> vma_start_read __refcount_inc_not_zero_limited_acquire munmap __vma_enter_locked refcount_add_not_zero vma_end_read vma_refcount_put __refcount_dec_and_test rcuwait_wait_event <finish operation> rcuwait_wake_up [UAF] Note that rcuwait_wait_event() in T3 does not block because refcount was already dropped by T1. At this point T3 can exit and free the mm causing UAF in T1. To avoid this we move vma->vm_mm verification into vma_start_read() and grab vma->vm_mm to stabilize it before vma_refcount_put() operation. [[email protected]: v3] Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Fixes: 3104138 ("mm: make vma cache SLAB_TYPESAFE_BY_RCU") Signed-off-by: Suren Baghdasaryan <[email protected]> Reported-by: Jann Horn <[email protected]> Closes: https://lore.kernel.org/all/CAG48ez0-deFbVH=E3jbkWx=X3uVbd8nWeo6kbJPQ0KoUD+m2tA@mail.gmail.com/ Reviewed-by: Vlastimil Babka <[email protected]> Acked-by: Lorenzo Stoakes <[email protected]> Cc: Jann Horn <[email protected]> Cc: Liam Howlett <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Suren Baghdasaryan <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3faa76b commit 1bcd236

2 files changed

Lines changed: 31 additions & 2 deletions

File tree

include/linux/mmap_lock.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ extern int rcuwait_wake_up(struct rcuwait *w);
1212
#include <linux/tracepoint-defs.h>
1313
#include <linux/types.h>
1414
#include <linux/cleanup.h>
15+
#include <linux/sched/mm.h>
1516

1617
#define MMAP_LOCK_INITIALIZER(name) \
1718
.mmap_lock = __RWSEM_INITIALIZER((name).mmap_lock),
@@ -154,6 +155,10 @@ static inline void vma_refcount_put(struct vm_area_struct *vma)
154155
* reused and attached to a different mm before we lock it.
155156
* Returns the vma on success, NULL on failure to lock and EAGAIN if vma got
156157
* detached.
158+
*
159+
* WARNING! The vma passed to this function cannot be used if the function
160+
* fails to lock it because in certain cases RCU lock is dropped and then
161+
* reacquired. Once RCU lock is dropped the vma can be concurently freed.
157162
*/
158163
static inline struct vm_area_struct *vma_start_read(struct mm_struct *mm,
159164
struct vm_area_struct *vma)
@@ -183,6 +188,31 @@ static inline struct vm_area_struct *vma_start_read(struct mm_struct *mm,
183188
}
184189

185190
rwsem_acquire_read(&vma->vmlock_dep_map, 0, 1, _RET_IP_);
191+
192+
/*
193+
* If vma got attached to another mm from under us, that mm is not
194+
* stable and can be freed in the narrow window after vma->vm_refcnt
195+
* is dropped and before rcuwait_wake_up(mm) is called. Grab it before
196+
* releasing vma->vm_refcnt.
197+
*/
198+
if (unlikely(vma->vm_mm != mm)) {
199+
/* Use a copy of vm_mm in case vma is freed after we drop vm_refcnt */
200+
struct mm_struct *other_mm = vma->vm_mm;
201+
202+
/*
203+
* __mmdrop() is a heavy operation and we don't need RCU
204+
* protection here. Release RCU lock during these operations.
205+
* We reinstate the RCU read lock as the caller expects it to
206+
* be held when this function returns even on error.
207+
*/
208+
rcu_read_unlock();
209+
mmgrab(other_mm);
210+
vma_refcount_put(vma);
211+
mmdrop(other_mm);
212+
rcu_read_lock();
213+
return NULL;
214+
}
215+
186216
/*
187217
* Overflow of vm_lock_seq/mm_lock_seq might produce false locked result.
188218
* False unlocked result is impossible because we modify and check

mm/mmap_lock.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ struct vm_area_struct *lock_vma_under_rcu(struct mm_struct *mm,
164164
*/
165165

166166
/* Check if the vma we locked is the right one. */
167-
if (unlikely(vma->vm_mm != mm ||
168-
address < vma->vm_start || address >= vma->vm_end))
167+
if (unlikely(address < vma->vm_start || address >= vma->vm_end))
169168
goto inval_end_read;
170169

171170
rcu_read_unlock();

0 commit comments

Comments
 (0)