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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 138BAC43460 for ; Fri, 23 Apr 2021 21:28:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8FD0C61469 for ; Fri, 23 Apr 2021 21:28:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FD0C61469 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 328856B006E; Fri, 23 Apr 2021 17:28:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FE9A6B0070; Fri, 23 Apr 2021 17:28:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C71D6B0071; Fri, 23 Apr 2021 17:28:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0037.hostedemail.com [216.40.44.37]) by kanga.kvack.org (Postfix) with ESMTP id 031716B006E for ; Fri, 23 Apr 2021 17:28:55 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B9B816115 for ; Fri, 23 Apr 2021 21:28:55 +0000 (UTC) X-FDA: 78064921830.07.C3487F4 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf06.hostedemail.com (Postfix) with ESMTP id 958C8C0007E0 for ; Fri, 23 Apr 2021 21:28:58 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 710D46146D; Fri, 23 Apr 2021 21:28:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1619213334; bh=T5RHb2YggDTpgWTv964Gu9/vr5TPsOYHkwyJI3FohCc=; h=Date:From:To:Subject:In-Reply-To:From; b=j/Gpgxk7xaTK0lvhYA4zQnaYFCMSiFALqvYrQ779w3g6UICb4+4BG4Cd/9rJjlWIy iUTB9alyY5GIM0rYi4SXJlQ0NbVEF9zO952AkaaWdnFbaV9RQr6A+a37L99Su+CuuR zYJYMrMKaj0mSrphilU9Hd3hlzb73RE6yuZ/Hbas= Date: Fri, 23 Apr 2021 14:28:54 -0700 From: Andrew Morton To: akpm@linux-foundation.org, christian.koenig@amd.com, daniel.vetter@ffwll.ch, jaharkes@cs.cmu.edu, jgg@ziepe.ca, linux-mm@kvack.org, miklos@szeredi.hu, mm-commits@vger.kernel.org, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 2/5] ovl: fix reference counting in ovl_mmap error path Message-ID: <20210423212854.Tu-9GzF1K%akpm@linux-foundation.org> In-Reply-To: <20210423142805.fd6d718ec3296452108b3ee0@linux-foundation.org> User-Agent: s-nail v14.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Stat-Signature: rbsxogxssezhjkwg6h8c5ye81tmoapht X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 958C8C0007E0 Received-SPF: none (linux-foundation.org>: No applicable sender policy available) receiver=imf06; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619213338-834806 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: =46rom: Christian K=C3=B6nig Subject: ovl: fix reference counting in ovl_mmap error path mmap_region() now calls fput() on the vma->vm_file. Fix this by using vma_set_file() so it doesn't need to be handled manually here any more. Link: https://lkml.kernel.org/r/20210421132012.82354-2-christian.koenig@amd= .com Fixes: 1527f926fd04 ("mm: mmap: fix fput in error path v2") Signed-off-by: Christian K=C3=B6nig Reviewed-by: Daniel Vetter Cc: Jan Harkes Cc: Miklos Szeredi Cc: Jason Gunthorpe Cc: [5.11+] Signed-off-by: Andrew Morton --- fs/overlayfs/file.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) --- a/fs/overlayfs/file.c~ovl-fix-reference-counting-in-ovl_mmap-error-path +++ a/fs/overlayfs/file.c @@ -430,20 +430,11 @@ static int ovl_mmap(struct file *file, s if (WARN_ON(file !=3D vma->vm_file)) return -EIO; =20 - vma->vm_file =3D get_file(realfile); + vma_set_file(vma, realfile); =20 old_cred =3D ovl_override_creds(file_inode(file)->i_sb); ret =3D call_mmap(vma->vm_file, vma); revert_creds(old_cred); - - if (ret) { - /* Drop reference count from new vm_file value */ - fput(realfile); - } else { - /* Drop reference count from previous vm_file value */ - fput(file); - } - ovl_file_accessed(file); =20 return ret; _