x86, pat: Fix memory leak in free_memtype

Reserve_memtype will allocate memory for new memtype, but
in free_memtype, after the memtype erased from rbtree, the
memory is not freed.

Changes since V1:
	make rbt_memtype_erase return erased memtype so that
	it can be freed in free_memtype.

[ hpa: not for -stable: 2.6.34 and earlier not affected ]

Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
LKML-Reference: <1274838670-8731-1-git-send-email-dfeng@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Jack Steiner <steiner@sgi.com>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index bbe5502ee1cb..acc15b23b743 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -336,6 +336,7 @@ int free_memtype(u64 start, u64 end)
 {
         int err = -EINVAL;
         int is_range_ram;
+        struct memtype *entry;
 
         if (!pat_enabled)
                 return 0;
@@ -355,17 +356,20 @@ int free_memtype(u64 start, u64 end)
         }
 
         spin_lock(&memtype_lock);
-        err = rbt_memtype_erase(start, end);
+        entry = rbt_memtype_erase(start, end);
         spin_unlock(&memtype_lock);
 
-        if (err) {
+        if (!entry) {
                 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
                         current->comm, current->pid, start, end);
+                return -EINVAL;
         }
 
+        kfree(entry);
+
         dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end);
 
-        return err;
+        return 0;
 }