Commit 7ea434a4 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds

mm/hwpoison-inject: fix refcounting in no-injection case

Hwpoison injection via debugfs:hwpoison/corrupt-pfn takes a refcount of
the target page.  But current code doesn't release it if the target page
is not supposed to be injected, which results in memory leak.  This patch
simply adds the refcount releasing code.
Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: default avatarDean Nelson <dnelson@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 602498f9
...@@ -40,7 +40,7 @@ static int hwpoison_inject(void *data, u64 val) ...@@ -40,7 +40,7 @@ static int hwpoison_inject(void *data, u64 val)
* This implies unable to support non-LRU pages. * This implies unable to support non-LRU pages.
*/ */
if (!PageLRU(p) && !PageHuge(p)) if (!PageLRU(p) && !PageHuge(p))
return 0; goto put_out;
/* /*
* do a racy check with elevated page count, to make sure PG_hwpoison * do a racy check with elevated page count, to make sure PG_hwpoison
...@@ -52,11 +52,14 @@ static int hwpoison_inject(void *data, u64 val) ...@@ -52,11 +52,14 @@ static int hwpoison_inject(void *data, u64 val)
err = hwpoison_filter(hpage); err = hwpoison_filter(hpage);
unlock_page(hpage); unlock_page(hpage);
if (err) if (err)
return 0; goto put_out;
inject: inject:
pr_info("Injecting memory failure at pfn %#lx\n", pfn); pr_info("Injecting memory failure at pfn %#lx\n", pfn);
return memory_failure(pfn, 18, MF_COUNT_INCREASED); return memory_failure(pfn, 18, MF_COUNT_INCREASED);
put_out:
put_page(hpage);
return 0;
} }
static int hwpoison_unpoison(void *data, u64 val) static int hwpoison_unpoison(void *data, u64 val)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment