Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3366866pxf; Mon, 5 Apr 2021 10:08:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7c9fUOlwI3QoBfrVDdVFOcYtikSdYhxQny2t9KMyk7Zal1x9UAxxeu/DnRgQVpfN/3vge X-Received: by 2002:aa7:dc56:: with SMTP id g22mr32785144edu.219.1617642513690; Mon, 05 Apr 2021 10:08:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617642513; cv=none; d=google.com; s=arc-20160816; b=dc8o3/I2ayrip8SSPlhmWmIJN1nkKskoBr8Zh/5CrF0SPmUNjAU0pV9tfGBy7PcHaY eF0eeuksUkXJ9X2R5uEkrZ9mB0r8P9jl6WQXc9RsGIgjc27YA6R8F55Tqya+1aqlPQeq 8FDjgoKVogqPSpOU0l2facFyJ5e3IWcDo8UByLaH13F9j6emcU5NHtCA3XyQAARglWPr QFdGcgSsqzbrJwbx5o93Tr2j17N9VEFzWCZufFMLHc5TCyEOHOM3F+nLk19RRl0435Ll 9uDQpxSj3hLgVIow8i7va6WTPFeK+T/ErPtBhzKg9xeNuyr2gyOoJtqPWRXZzzbh6Srw AKCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=C16lZstj+B/n9Z3kP++1+sD9cjPZoN+QiJ76Py1854g=; b=UP+IgqndmkFc11u4B1oqsrgyVcJ8+AVamkVcyYuzRPugcoC3jlcySPgZ/vmQ4IISda dMPF261T5EKjel2u7kiBeMuoaqtfv4jA9BB9PgjTRndCZtT98P4ctRsF5gIyZ9Ead0oO QzqqaOPTajCKzWWphABoCPYspCIN8ouAQaboXfobDR4Kuf7O7JyK/J2XX1wdlLptn7L+ fIKYeL4KglxIKkiKv3aGBcLT3zXmQeNFaQ3BQtFOnoOtEUfOFD0QdAtt49/xwEcwsH3O DOQ3sck1ZqCvS0d3+p5LAvfRScXM6cU0qbx6sVzvJlECcAh2ArqbuNfLfr1jyyJ7LqOl /H2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0BUZisL2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qo17si1222648ejb.736.2021.04.05.10.08.10; Mon, 05 Apr 2021 10:08:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0BUZisL2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240105AbhDEJS5 (ORCPT + 99 others); Mon, 5 Apr 2021 05:18:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:34482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240549AbhDEJPR (ORCPT ); Mon, 5 Apr 2021 05:15:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C4D6861393; Mon, 5 Apr 2021 09:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617614111; bh=c489M/+1dRocyyjFIWmCDQRJV1jzQJ61lEA3Li+T3r8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0BUZisL2T0ik4PBPUEzXwNRSMcND46Om2/CpHXZw3NKSQl2yYFM2p8dnjz0kSxT4X Fc9FfJraHBNnyOTgmLg39cXFceW0L6HgYGNR3r34sGLkvCqUaFJrKkc7KGPflrwa50 CzAvgJ+eVzaLyOx2pSt4wwdHHLNo1RU94tcFcMXo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Lipnitskiy , Hugh Dickins , "Eric W. Biederman" , =?UTF-8?q?=E5=91=A8=E7=90=B0=E6=9D=B0=20 ?= , Linus Torvalds Subject: [PATCH 5.11 087/152] mm: fix race by making init_zero_pfn() early_initcall Date: Mon, 5 Apr 2021 10:53:56 +0200 Message-Id: <20210405085037.083212607@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085034.233917714@linuxfoundation.org> References: <20210405085034.233917714@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilya Lipnitskiy commit e720e7d0e983bf05de80b231bccc39f1487f0f16 upstream. There are code paths that rely on zero_pfn to be fully initialized before core_initcall. For example, wq_sysfs_init() is a core_initcall function that eventually results in a call to kernel_execve, which causes a page fault with a subsequent mmput. If zero_pfn is not initialized by then it may not get cleaned up properly and result in an error: BUG: Bad rss-counter state mm:(ptrval) type:MM_ANONPAGES val:1 Here is an analysis of the race as seen on a MIPS device. On this particular MT7621 device (Ubiquiti ER-X), zero_pfn is PFN 0 until initialized, at which point it becomes PFN 5120: 1. wq_sysfs_init calls into kobject_uevent_env at core_initcall: kobject_uevent_env+0x7e4/0x7ec kset_register+0x68/0x88 bus_register+0xdc/0x34c subsys_virtual_register+0x34/0x78 wq_sysfs_init+0x1c/0x4c do_one_initcall+0x50/0x1a8 kernel_init_freeable+0x230/0x2c8 kernel_init+0x10/0x100 ret_from_kernel_thread+0x14/0x1c 2. kobject_uevent_env() calls call_usermodehelper_exec() which executes kernel_execve asynchronously. 3. Memory allocations in kernel_execve cause a page fault, bumping the MM reference counter: add_mm_counter_fast+0xb4/0xc0 handle_mm_fault+0x6e4/0xea0 __get_user_pages.part.78+0x190/0x37c __get_user_pages_remote+0x128/0x360 get_arg_page+0x34/0xa0 copy_string_kernel+0x194/0x2a4 kernel_execve+0x11c/0x298 call_usermodehelper_exec_async+0x114/0x194 4. In case zero_pfn has not been initialized yet, zap_pte_range does not decrement the MM_ANONPAGES RSS counter and the BUG message is triggered shortly afterwards when __mmdrop checks the ref counters: __mmdrop+0x98/0x1d0 free_bprm+0x44/0x118 kernel_execve+0x160/0x1d8 call_usermodehelper_exec_async+0x114/0x194 ret_from_kernel_thread+0x14/0x1c To avoid races such as described above, initialize init_zero_pfn at early_initcall level. Depending on the architecture, ZERO_PAGE is either constant or gets initialized even earlier, at paging_init, so there is no issue with initializing zero_pfn earlier. Link: https://lkml.kernel.org/r/CALCv0x2YqOXEAy2Q=hafjhHCtTHVodChv1qpM=niAXOpqEbt7w@mail.gmail.com Signed-off-by: Ilya Lipnitskiy Cc: Hugh Dickins Cc: "Eric W. Biederman" Cc: stable@vger.kernel.org Tested-by: 周琰杰 (Zhou Yanjie) Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memory.c +++ b/mm/memory.c @@ -154,7 +154,7 @@ static int __init init_zero_pfn(void) zero_pfn = page_to_pfn(ZERO_PAGE(0)); return 0; } -core_initcall(init_zero_pfn); +early_initcall(init_zero_pfn); void mm_trace_rss_stat(struct mm_struct *mm, int member, long count) {