mempolicy: fix dangling reference to tmpfs superblock mpol (5c0c1654) · Commits · 戴 / test

My patch to "Factor out duplicate put/frees in mpol_shared_policy_init() to a common return path"; and Dan Carpenter's fix thereto both left a dangling reference to the incoming tmpfs superblock mempolicy structure. A similar leak was introduced earlier when the nodemask was moved offstack to the scratch area despite the note in the comment block regarding the incoming ref. Move the remaining 'put of the incoming "mpol" to the common exit path to drop the reference. Signed-off-by:

Lee Schermerhorn <lee.schermerhorn@hp.com> Acked-by:

Dan Carpenter <error27@gmail.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: David Rientjes <rientjes@google.com> Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

mm/mempolicy.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -2094,7 +2094,7 @@ void mpol_shared_policy_init(struct shared_policy sp, struct mempolicy mpol)
		NODEMASK_SCRATCH(scratch);

		if (!scratch)
		return;
		goto put_mpol;
		/* contextualize the tmpfs mount point mempolicy */
		new = mpol_new(mpol->mode, mpol->flags, &mpol->w.user_nodemask);
		if (IS_ERR(new))
		@@ -2103,19 +2103,20 @@ void mpol_shared_policy_init(struct shared_policy sp, struct mempolicy mpol)
		task_lock(current);
		ret = mpol_set_nodemask(new, &mpol->w.user_nodemask, scratch);
		task_unlock(current);
		mpol_put(mpol); /* drop our ref on sb mpol */
		if (ret)
		goto put_free;
		goto put_new;

		/* Create pseudo-vma that contains just the policy */
		memset(&pvma, 0, sizeof(struct vm_area_struct));
		pvma.vm_end = TASK_SIZE; /* policy covers entire file */
		mpol_set_shared_policy(sp, &pvma, new); /* adds ref */

		put_free:
		put_new:
		mpol_put(new); /* drop initial ref */
		free_scratch:
		NODEMASK_SCRATCH_FREE(scratch);
		put_mpol:
		mpol_put(mpol); /* drop our incoming ref on sb mpol */
		}
		}

Admin message