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=-10.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 89E0FC4727C for ; Wed, 30 Sep 2020 15:32:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0ADD421D7F for ; Wed, 30 Sep 2020 15:32:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="gFZU59qg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ADD421D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 5CD978E0003; Wed, 30 Sep 2020 11:32:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 557378E0001; Wed, 30 Sep 2020 11:32:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41D968E0003; Wed, 30 Sep 2020 11:32:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id 2344E8E0001 for ; Wed, 30 Sep 2020 11:32:41 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id AA7634DA2 for ; Wed, 30 Sep 2020 15:32:40 +0000 (UTC) X-FDA: 77320120080.16.coal51_3f0e86b27193 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 74AAC1012A0EF for ; Wed, 30 Sep 2020 15:32:40 +0000 (UTC) X-HE-Tag: coal51_3f0e86b27193 X-Filterd-Recvd-Size: 4493 Received: from aserp2120.oracle.com (aserp2120.oracle.com [141.146.126.78]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Wed, 30 Sep 2020 15:32:39 +0000 (UTC) Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 08UFTr4B188903; Wed, 30 Sep 2020 15:32:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2020-01-29; bh=d/eusaO+AEks0iXtWCFRWJ64qkcUPYgw88R7l/46ERQ=; b=gFZU59qgDvxOopk2tiRMbok0JGzOwMTmLIt8HN7ThsYPSbPDEUwCH9O/7bfiI1GKqC4A XKXQPhDlWeB8XGz2/Pq8MsQ6emFqLTmybE6lq5vLWqma3CXNkCq37aLIrq8sAG5Bq3fy XB1nz9uPaeHQdPHBieJm0CfWSs2EG2mx5N6928wGPUjz2d0kXs8lqIaaNjVE3jZVEpAo r9tCBOWTN4LjzPCkZY4jcncZhWKATT94RCyGUSdWogtCVTqKS/CmXyYD4Ri/wbJ09uVI rSk7qjfAWGhrrVr28dJUkGHNGtgbtx+ktiaj23m/xejnRSbelanG17QvJS4y9WsDR4XN 1g== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 33swkm16hn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 30 Sep 2020 15:32:25 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 08UFUVtn089615; Wed, 30 Sep 2020 15:32:25 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3020.oracle.com with ESMTP id 33tfj09py3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Sep 2020 15:32:24 +0000 Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 08UFWNt5000711; Wed, 30 Sep 2020 15:32:23 GMT Received: from localhost (/10.159.225.72) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 30 Sep 2020 08:32:22 -0700 Date: Wed, 30 Sep 2020 08:32:21 -0700 From: "Darrick J. Wong" To: Miaohe Lin Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm: Fix potential memory leak in sys_swapon Message-ID: <20200930153221.GE49559@magnolia> References: <20200930101803.53884-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200930101803.53884-1-linmiaohe@huawei.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9759 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0 phishscore=0 malwarescore=0 adultscore=0 suspectscore=5 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009300124 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9759 signatures=668680 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 phishscore=0 suspectscore=5 mlxlogscore=999 clxscore=1011 priorityscore=1501 impostorscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2009300124 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: On Wed, Sep 30, 2020 at 06:18:03AM -0400, Miaohe Lin wrote: > If we failed to drain inode, we would forget to free the swap address space > allocated by init_swap_address_space() above. > > Fixes: dc617f29dbe5 ("vfs: don't allow writes to swap files") > Signed-off-by: Miaohe Lin LGTM, Reviewed-by: Darrick J. Wong --D > --- > mm/swapfile.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 2b0c5fc1b0e6..4522b458a814 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -3342,7 +3342,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) > 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 __user *, specialfile, int, swap_flags) > > error = 0; > goto out; > +free_swap_address_space: > + exit_swap_address_space(p->type); > bad_swap_unlock_inode: > inode_unlock(inode); > bad_swap: > -- > 2.19.1 >