Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753165AbbDQCJ5 (ORCPT ); Thu, 16 Apr 2015 22:09:57 -0400 Received: from TYO202.gate.nec.co.jp ([210.143.35.52]:64847 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751284AbbDQCJu convert rfc822-to-8bit (ORCPT ); Thu, 16 Apr 2015 22:09:50 -0400 From: Naoya Horiguchi To: Andrew Morton CC: Dean Nelson , Andi Kleen , "Andrea Arcangeli" , Hidetoshi Seto , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH 1/2] mm/hwpoison-inject: fix refcounting in no-injection case Thread-Topic: [PATCH 1/2] mm/hwpoison-inject: fix refcounting in no-injection case Thread-Index: AQHQeLNzxhQhWCw60UaQCJgUY+YAaw== Date: Fri, 17 Apr 2015 02:08:52 +0000 Message-ID: <1429236509-8796-1-git-send-email-n-horiguchi@ah.jp.nec.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.128.101.1] Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1484 Lines: 46 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: Naoya Horiguchi --- mm/hwpoison-inject.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git v4.0.orig/mm/hwpoison-inject.c v4.0/mm/hwpoison-inject.c index 329caf56df22..2b3f933e3282 100644 --- v4.0.orig/mm/hwpoison-inject.c +++ v4.0/mm/hwpoison-inject.c @@ -40,7 +40,7 @@ static int hwpoison_inject(void *data, u64 val) * This implies unable to support non-LRU pages. */ if (!PageLRU(p) && !PageHuge(p)) - return 0; + goto put_out; /* * 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) err = hwpoison_filter(hpage); unlock_page(hpage); if (err) - return 0; + goto put_out; inject: pr_info("Injecting memory failure at pfn %#lx\n", pfn); return memory_failure(pfn, 18, MF_COUNT_INCREASED); +put_out: + put_page(hpage); + return 0; } static int hwpoison_unpoison(void *data, u64 val) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/