Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cae3457 authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds
Browse files

mempolicy: ERR_PTR dereference in mpol_shared_policy_init() 



The original code called mpol_put(new) while "new" was an ERR_PTR.

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1cdc467

mm/mempolicy.c

+2 −1
Original line number Diff line number Diff line
@@ -2098,7 +2098,7 @@ void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol) 
		/* contextualize the tmpfs mount point mempolicy */

		new = mpol_new(mpol->mode, mpol->flags, &mpol->w.user_nodemask);

		if (IS_ERR(new))

			goto put_free; /* no valid nodemask intersection */

			goto free_scratch; /* no valid nodemask intersection */



		task_lock(current);

		ret = mpol_set_nodemask(new, &mpol->w.user_nodemask, scratch);
@@ -2114,6 +2114,7 @@ void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol) 


put_free:

		mpol_put(new);			/* drop initial ref */

free_scratch:

		NODEMASK_SCRATCH_FREE(scratch);

	}

}