mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Christoph Lameter <cl@linux.com>
Cc: Josh Boyer <jwboyer@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index f14ae9adec2091671cee13c8c52e4327f83599fd..9cc60d45d20ffe72af0ec9c681a6429a1a305e4f 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1604,16 +1604,13 @@ struct mempolicy *get_vma_policy(struct task_struct *task,
                struct vm_area_struct *vma, unsigned long addr)
 {
        struct mempolicy *pol = get_task_policy(task);
-       int got_ref;
 
        if (vma) {
                if (vma->vm_ops && vma->vm_ops->get_policy) {
                        struct mempolicy *vpol = vma->vm_ops->get_policy(vma,
                                                                        addr);
-                       if (vpol) {
+                       if (vpol)
                                pol = vpol;
-                               got_ref = 1;
-                       }
                } else if (vma->vm_policy) {
                        pol = vma->vm_policy;