Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2785718ybg; Mon, 28 Oct 2019 02:19:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyG2vEVGssNaQEaih54NPbKMHKsoJAnTTIh5+LsZmozoU0RovUVOuxUKzqwmxpzynRqR2nc X-Received: by 2002:a17:906:a98f:: with SMTP id jr15mr15036643ejb.298.1572254386988; Mon, 28 Oct 2019 02:19:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572254386; cv=none; d=google.com; s=arc-20160816; b=w9HwB2bPQ3bGvPFNaOzt/xJ5daZ/2dHR3Y5EPlxe6tstD2TPh5W7eOijDGXO2zvTNX 5rX3myPJxIGaf3hMIW4ZFilqdMuNCZRvbbeKTUNBt8PKcJFyR+sXXG6rbyY4trqmlHbi 4lZdrjTPtfXFuzQ4QJkzlACti3AmfabmW8kPi9+1o+akrU7Sg7vOcF85a86O24muV1Yd ZFrsXW03GMSoKLQ4s1n3dDM6pTfSdb1c9OilAh+kOBJlQ14XMzKFmPk5sUhWGXhA6pOK nQKI7OMhMbSM/YQ/c4ntp21yov5LGw2Nmu+H+rpz5YKS/+P1THOy4YO7HfptexbRLWSt 5Swg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H1fj6zUbQjCggimF7qKgnDBpT9x4AOLr+7sK2eYBvLY=; b=sIsQH4iiOZbQAasNfsVF3lmMaXGkvzN0VatummisedokDmVszG4/b1RtIJSyxVSu3j +PzpjX++YiCjFsr3l/eKKaoNY/S+Wy1o5lyXeKH8+P6f2NiOt3yo/sI/KgtgsKdIv3sQ vZ998lJYg1jGxx1Ut7ys/DwNYh0HMxH0+PON/NctDVpaVCzBonl0Sg5r3Dlis0J+5SE4 LhVuamCivGh/iCcjBD5YqhyerC1anGla72Dx5pRg7bJEZNjKlNLhzQ6VrDUCErcnvTvO 8AieZccpAGhBkVNCDUJvL8RjIItv6/ytquIlKrDBgjwi1cyFdmXeCKmLUzfgDVI0ubuv 89Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nYeupQGG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p29si7591850eda.104.2019.10.28.02.19.23; Mon, 28 Oct 2019 02:19:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nYeupQGG; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732374AbfJ0VXj (ORCPT + 99 others); Sun, 27 Oct 2019 17:23:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:44776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732364AbfJ0VXe (ORCPT ); Sun, 27 Oct 2019 17:23:34 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2B39205C9; Sun, 27 Oct 2019 21:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211414; bh=lKgQpJ6lldb24qjFTVG9e/CiNh4+PFY2l5F0C51r+fE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nYeupQGG5I7HIVd303hZcG0mwHvReTW3bNUidNVRS6oxRdeTQEf17lRcmzFRtgqoR OgOCh7P3MvSgRM67qH+0FHqroetx62osIzoKPgSBUe4b5AFIT44G/TX4G7se6N8wUq umR3dlbgm44YTEfZb0K6CGtblkwB/009CrdnW2o4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, David Hildenbrand , Naoya Horiguchi , Michal Hocko , Andrew Morton , Linus Torvalds Subject: [PATCH 5.3 144/197] mm/memory-failure.c: dont access uninitialized memmaps in memory_failure() Date: Sun, 27 Oct 2019 22:01:02 +0100 Message-Id: <20191027203359.469037864@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Hildenbrand commit 96c804a6ae8c59a9092b3d5dd581198472063184 upstream. We should check for pfn_to_online_page() to not access uninitialized memmaps. Reshuffle the code so we don't have to duplicate the error message. Link: http://lkml.kernel.org/r/20191009142435.3975-3-david@redhat.com Signed-off-by: David Hildenbrand Fixes: f1dd2cd13c4b ("mm, memory_hotplug: do not associate hotadded memory to zones until online") [visible after d0dc12e86b319] Acked-by: Naoya Horiguchi Cc: Michal Hocko Cc: [4.13+] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memory-failure.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1253,17 +1253,19 @@ int memory_failure(unsigned long pfn, in if (!sysctl_memory_failure_recovery) panic("Memory failure on page %lx", pfn); - if (!pfn_valid(pfn)) { + p = pfn_to_online_page(pfn); + if (!p) { + if (pfn_valid(pfn)) { + pgmap = get_dev_pagemap(pfn, NULL); + if (pgmap) + return memory_failure_dev_pagemap(pfn, flags, + pgmap); + } pr_err("Memory failure: %#lx: memory outside kernel control\n", pfn); return -ENXIO; } - pgmap = get_dev_pagemap(pfn, NULL); - if (pgmap) - return memory_failure_dev_pagemap(pfn, flags, pgmap); - - p = pfn_to_page(pfn); if (PageHuge(p)) return memory_failure_hugetlb(pfn, flags); if (TestSetPageHWPoison(p)) {