Commit 43362a49 authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

oom: fix race while temporarily setting current's oom_score_adj 



test_set_oom_score_adj() was introduced in 72788c38 ("oom: replace
PF_OOM_ORIGIN with toggling oom_score_adj") to temporarily elevate
current's oom_score_adj for ksm and swapoff without requiring an
additional per-process flag.

Using that function to both set oom_score_adj to OOM_SCORE_ADJ_MAX and
then reinstate the previous value is racy since it's possible that
userspace can set the value to something else itself before the old value
is reinstated.  That results in userspace setting current's oom_score_adj
to a different value and then the kernel immediately setting it back to
its previous value without notification.

To fix this, a new compare_swap_oom_score_adj() function is introduced
with the same semantics as the compare and swap CAS instruction, or
CMPXCHG on x86.  It is used to reinstate the previous value of
oom_score_adj if and only if the present value is the same as the old
value.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Ying Han <yinghan@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c9f01245

include/linux/oom.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ enum oom_constraint { 
	CONSTRAINT_MEMCG,

};



extern void compare_swap_oom_score_adj(int old_val, int new_val);

extern int test_set_oom_score_adj(int new_val);



extern unsigned int oom_badness(struct task_struct *p, struct mem_cgroup *mem,

mm/ksm.c

+2 −1
Original line number Diff line number Diff line
@@ -1905,7 +1905,8 @@ static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr, 


			oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);

			err = unmerge_and_remove_all_rmap_items();

			test_set_oom_score_adj(oom_score_adj);

			compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX,

								oom_score_adj);

			if (err) {

				ksm_run = KSM_RUN_STOP;

				count = err;

mm/oom_kill.c

+19 −0
Original line number Diff line number Diff line
@@ -39,6 +39,25 @@ int sysctl_oom_kill_allocating_task; 
int sysctl_oom_dump_tasks = 1;

static DEFINE_SPINLOCK(zone_scan_lock);



/*

 * compare_swap_oom_score_adj() - compare and swap current's oom_score_adj

 * @old_val: old oom_score_adj for compare

 * @new_val: new oom_score_adj for swap

 *

 * Sets the oom_score_adj value for current to @new_val iff its present value is

 * @old_val.  Usually used to reinstate a previous value to prevent racing with

 * userspacing tuning the value in the interim.

 */

void compare_swap_oom_score_adj(int old_val, int new_val)

{

	struct sighand_struct *sighand = current->sighand;



	spin_lock_irq(&sighand->siglock);

	if (current->signal->oom_score_adj == old_val)

		current->signal->oom_score_adj = new_val;

	spin_unlock_irq(&sighand->siglock);

}



/**

 * test_set_oom_score_adj() - set current's oom_score_adj and return old value

 * @new_val: new oom_score_adj value

mm/swapfile.c

+1 −1
Original line number Diff line number Diff line
@@ -1617,7 +1617,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) 


	oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);

	err = try_to_unuse(type);

	test_set_oom_score_adj(oom_score_adj);

	compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX, oom_score_adj);



	if (err) {

		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE