linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [patch] mempolicy: ERR_PTR dereference in mpol_shared_policy_init()
@ 2010-05-25 21:54 Dan Carpenter
  2010-05-25 23:08 ` David Rientjes
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2010-05-25 21:54 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Lee Schermerhorn, KOSAKI Motohiro, Christoph Lameter,
	David Rientjes, linux-kernel, linux-mm, kernel-janitors

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

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 7575101..5d6fb33 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -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);
 	}
 }

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch] mempolicy: ERR_PTR dereference in mpol_shared_policy_init()
  2010-05-25 21:54 [patch] mempolicy: ERR_PTR dereference in mpol_shared_policy_init() Dan Carpenter
@ 2010-05-25 23:08 ` David Rientjes
  0 siblings, 0 replies; 2+ messages in thread
From: David Rientjes @ 2010-05-25 23:08 UTC (permalink / raw)
  To: Dan Carpenter, Andrew Morton, Lee Schermerhorn, KOSAKI Motohiro,
	Christoph Lameter, linux-kernel, linux-mm, kernel-janitors

On Tue, 25 May 2010, Dan Carpenter wrote:

> The original code called mpol_put(new) while "new" was an ERR_PTR.
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>

Acked-by: David Rientjes <rientjes@google.com>

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-05-25 23:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-25 21:54 [patch] mempolicy: ERR_PTR dereference in mpol_shared_policy_init() Dan Carpenter
2010-05-25 23:08 ` David Rientjes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox