From patchwork Thu May 28 05:20:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 225169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DED5C433DF for ; Thu, 28 May 2020 05:20:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9217214D8 for ; Thu, 28 May 2020 05:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590643245; bh=MrCAZlU4EB5nz5nzwXu8l+1jDN7Xtlc8i+XkLVS6kdo=; h=Date:From:To:Subject:In-Reply-To:List-ID:From; b=1o5Wfvl840FFN/NDJry5/+6GjAgggYFIS+vTI3e6RfJ0JQiz2QfPHWzZiRa7TUC2S yUI7GFjUQlf1Q+a64ZGYMfH0MEScZbH2sLNDcRYz77hhX2L6AmmlaaTTMiJyAaKzy9 DTb1jUDIjchFmwXGG4BBd8kOYXMUCGLXTgyQO46E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727807AbgE1FUp (ORCPT ); Thu, 28 May 2020 01:20:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:45248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbgE1FUp (ORCPT ); Thu, 28 May 2020 01:20:45 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 6451F21475; Thu, 28 May 2020 05:20:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590643244; bh=MrCAZlU4EB5nz5nzwXu8l+1jDN7Xtlc8i+XkLVS6kdo=; h=Date:From:To:Subject:In-Reply-To:From; b=jk9BWgPlC3v5l/HxJTpEEWyhl9NGR08RaxRt/yoecO83q7Mej/NWvo2pwFSaedzDX 5i7unq2zoqwWPeaR1hWKb4gtcBl4KcZGKnZ719ZSBRKBHZw1mqQ8s5ZLHgSASAOWGT jYO9C2m+LDy9TQwz7GxwiZIVx/eBHXPuYNIWUNk0= Date: Wed, 27 May 2020 22:20:43 -0700 From: Andrew Morton To: akpm@linux-foundation.org, hannes@cmpxchg.org, hughd@google.com, kirill.shutemov@linux.intel.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, riel@surriel.com, songliubraving@fb.com, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 2/5] mm,thp: stop leaking unreleased file pages Message-ID: <20200528052043.TKW9wStFk%akpm@linux-foundation.org> In-Reply-To: <20200527222015.62ba8592af63dae12ab58ffe@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hugh Dickins Subject: mm,thp: stop leaking unreleased file pages When collapse_file() calls try_to_release_page(), it has already isolated the page: so if releasing buffers happens to fail (as it sometimes does), remember to putback_lru_page(): otherwise that page is left unreclaimable and unfreeable, and the file extent uncollapsible. Link: http://lkml.kernel.org/r/alpine.LSU.2.11.2005231837500.1766@eggly.anvils Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS") Signed-off-by: Hugh Dickins Acked-by: Song Liu Acked-by: Kirill A. Shutemov Acked-by: Johannes Weiner Cc: Rik van Riel Cc: [5.4+] Signed-off-by: Andrew Morton --- mm/khugepaged.c | 1 + 1 file changed, 1 insertion(+) --- a/mm/khugepaged.c~mmthp-stop-leaking-unreleased-file-pages +++ a/mm/khugepaged.c @@ -1692,6 +1692,7 @@ static void collapse_file(struct mm_stru if (page_has_private(page) && !try_to_release_page(page, GFP_KERNEL)) { result = SCAN_PAGE_HAS_PRIVATE; + putback_lru_page(page); goto out_unlock; } From patchwork Thu May 28 05:20:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 225168 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F119EC433E0 for ; Thu, 28 May 2020 05:20:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4194214D8 for ; Thu, 28 May 2020 05:20:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590643253; bh=8F95w6NfYH4Aub7J6ainY1th9ClMvivYnWp8faYCQbE=; h=Date:From:To:Subject:In-Reply-To:List-ID:From; b=Q3QXqHjh3ti37Z7ZHBf6lDQ90BVQciSNr2JD4R99G/VfKY53D1ISczdNptewXkze3 M4fkuakP4vQlUpbv98Ydmre1KmMOwHprI2wZMpcz2w3rtHxWgDNgWLfjhBUOgmy4Bn 95E6EP6yr8K+yNS95DOJFtRfWIuAatM04HP0OW7Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727056AbgE1FUx (ORCPT ); Thu, 28 May 2020 01:20:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:45446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbgE1FUx (ORCPT ); Thu, 28 May 2020 01:20:53 -0400 Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (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 A54F4206F1; Thu, 28 May 2020 05:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590643253; bh=8F95w6NfYH4Aub7J6ainY1th9ClMvivYnWp8faYCQbE=; h=Date:From:To:Subject:In-Reply-To:From; b=18RgYJlpK+mXG3ym1oOEanuO90hDfkritfzG84ckuzkpQL+2Fe9iO5dS1Z3SIizUj AnMFuzpkOSXQdoeD3ExTdB4RXZI89SSaeLY+s+VS6cO8q1MPNsUZ8TLTe+sNSIac5Y rcLjL1UuDY23JgXLTkXb5cqKr0wmbN+6+g7mcGzI= Date: Wed, 27 May 2020 22:20:52 -0700 From: Andrew Morton To: adobriyan@gmail.com, akpm@linux-foundation.org, glider@google.com, keescook@chromium.org, linux-mm@kvack.org, mm-commits@vger.kernel.org, stable@vger.kernel.org, sunhaoyl@outlook.com, torvalds@linux-foundation.org, viro@zeniv.linux.org.uk Subject: [patch 4/5] fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info() Message-ID: <20200528052052.tLpI_z4pp%akpm@linux-foundation.org> In-Reply-To: <20200527222015.62ba8592af63dae12ab58ffe@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alexander Potapenko Subject: fs/binfmt_elf.c: allocate initialized memory in fill_thread_core_info() KMSAN reported uninitialized data being written to disk when dumping core. As a result, several kilobytes of kmalloc memory may be written to the core file and then read by a non-privileged user. Link: http://lkml.kernel.org/r/20200419100848.63472-1-glider@google.com Link: https://github.com/google/kmsan/issues/76 Signed-off-by: Alexander Potapenko Reported-by: sam Acked-by: Kees Cook Cc: Al Viro Cc: Alexey Dobriyan Cc: Signed-off-by: Andrew Morton --- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/binfmt_elf.c~fs-binfmt_elfc-allocate-initialized-memory-in-fill_thread_core_info +++ a/fs/binfmt_elf.c @@ -1733,7 +1733,7 @@ static int fill_thread_core_info(struct (!regset->active || regset->active(t->task, regset) > 0)) { int ret; size_t size = regset_size(t->task, regset); - void *data = kmalloc(size, GFP_KERNEL); + void *data = kzalloc(size, GFP_KERNEL); if (unlikely(!data)) return 0; ret = regset->get(t->task, regset,