From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=BAYES_00,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 577A9C4363A for ; Tue, 13 Oct 2020 23:52:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F33C421D7B for ; Tue, 13 Oct 2020 23:52:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="G67jkW1w" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F33C421D7B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 914316B00C8; Tue, 13 Oct 2020 19:52:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 875596B00C9; Tue, 13 Oct 2020 19:52:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 764FE6B00CA; Tue, 13 Oct 2020 19:52:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 461306B00C8 for ; Tue, 13 Oct 2020 19:52:32 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id E4F95180AD807 for ; Tue, 13 Oct 2020 23:52:31 +0000 (UTC) X-FDA: 77368554102.01.group05_020dca427207 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id CD65210045EE7 for ; Tue, 13 Oct 2020 23:52:31 +0000 (UTC) X-HE-Tag: group05_020dca427207 X-Filterd-Recvd-Size: 2549 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Tue, 13 Oct 2020 23:52:31 +0000 (UTC) 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 764D322201; Tue, 13 Oct 2020 23:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602633150; bh=GF09NVJtBVs1gTLe/m/MvSCBtUzH1ujS5HRkUN1/55I=; h=Date:From:To:Subject:In-Reply-To:From; b=G67jkW1wDAPhPOu46Q9gHFmvTHEpsIoVZCwYkL82tC3PuWqUIHUB7VuaiC/e3KbVv CkK5IFQpKDdj/o8NUHDE8ePaa6we2t/yG/pz0d6xrzDphY6IB8tEc5Ky2C+nececxw jgvycfTvvOLWnGtKdWC0szkD3dTB6i1asivB7C1A= Date: Tue, 13 Oct 2020 16:52:30 -0700 From: Andrew Morton To: akpm@linux-foundation.org, darrick.wong@oracle.com, linmiaohe@huawei.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 076/181] mm/swapfile.c: fix potential memory leak in sys_swapon Message-ID: <20201013235230.5_jVCBMHF%akpm@linux-foundation.org> In-Reply-To: <20201013164658.3bfd96cc224d8923e66a9f4e@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Miaohe Lin Subject: mm/swapfile.c: fix potential memory leak in sys_swapon If we failed to drain inode, we would forget to free the swap address space allocated by init_swap_address_space() above. Link: https://lkml.kernel.org/r/20200930101803.53884-1-linmiaohe@huawei.com Fixes: dc617f29dbe5 ("vfs: don't allow writes to swap files") Signed-off-by: Miaohe Lin Reviewed-by: Darrick J. Wong Signed-off-by: Andrew Morton --- mm/swapfile.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/mm/swapfile.c~mm-fix-potential-memory-leak-in-sys_swapon +++ a/mm/swapfile.c @@ -3342,7 +3342,7 @@ SYSCALL_DEFINE2(swapon, const char __use error = inode_drain_writes(inode); if (error) { inode->i_flags &= ~S_SWAPFILE; - goto bad_swap_unlock_inode; + goto free_swap_address_space; } mutex_lock(&swapon_mutex); @@ -3367,6 +3367,8 @@ SYSCALL_DEFINE2(swapon, const char __use error = 0; goto out; +free_swap_address_space: + exit_swap_address_space(p->type); bad_swap_unlock_inode: inode_unlock(inode); bad_swap: _