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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9355C433FE for ; Fri, 30 Sep 2022 09:59:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 28C1F8D0002; Fri, 30 Sep 2022 05:59:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 23C578D0001; Fri, 30 Sep 2022 05:59:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1517D8D0002; Fri, 30 Sep 2022 05:59:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 06D4D8D0001 for ; Fri, 30 Sep 2022 05:59:44 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BDA9040A78 for ; Fri, 30 Sep 2022 09:59:43 +0000 (UTC) X-FDA: 79968305046.12.A035057 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 545D714000B for ; Fri, 30 Sep 2022 09:59:43 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4D15162052; Fri, 30 Sep 2022 09:59:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B55FAC433D6; Fri, 30 Sep 2022 09:59:39 +0000 (UTC) Date: Fri, 30 Sep 2022 10:59:36 +0100 From: Catalin Marinas To: Carlos Llamas Cc: Andrew Morton , Michal Hocko , Christian Brauner , linux-mm@kvack.org, bpf@vger.kernel.org, kernel-team@android.com, Liam Howlett , Suren Baghdasaryan , stable@vger.kernel.org Subject: Re: [PATCH] mm/mmap: undo ->mmap() when arch_validate_flags() fails Message-ID: References: <20220930003844.1210987-1-cmllamas@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220930003844.1210987-1-cmllamas@google.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664531983; a=rsa-sha256; cv=none; b=cu1SE91iNHfdpRwtz6GY9pKhyYWRjHVdQtCigT0yTVFr6HVzzq0lHOpt85ZFLOcCLgjqaN ms88ul5aZaKIWNtSbHvwVDkJI4E6i5HuPP0LbMwVMuRyTx75+dvLCiE0ahP9zrIaBqFiBI 7JiaqFWKzK9QgOX1sSzOJSmDrQVEwzo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf09.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664531983; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cBFvvGTvH0yM8yIbznot9oKYbpIFDkvupD3uF0p6gWo=; b=XfT75MCz35oWT9Sd4OuV/EyxYoHVlZu0XwTD8nAmM1Iq/EXiH70CNW0Zxi5tkp1VqoPihL azV4pt1Hk0pyrEEgnU19BTUq3XErICpvng2Sk0KPMMpnojEPj8+HvSs5JDSg1SCRgMmt5T J/QUnsh9lKINZVw8bbvvzRcrmCnjE38= X-Rspamd-Queue-Id: 545D714000B X-Rspam-User: Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf09.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org X-Rspamd-Server: rspam03 X-Stat-Signature: esmgku6mseht7xt55oohrijfb64o8bme X-HE-Tag: 1664531983-133302 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 Fri, Sep 30, 2022 at 12:38:43AM +0000, Carlos Llamas wrote: > diff --git a/mm/mmap.c b/mm/mmap.c > index 9d780f415be3..36c08e2c78da 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -1797,7 +1797,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > if (!arch_validate_flags(vma->vm_flags)) { > error = -EINVAL; > if (file) > - goto unmap_and_free_vma; > + goto close_and_free_vma; > else > goto free_vma; > } > @@ -1844,6 +1844,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > > return addr; > > +close_and_free_vma: > + if (vma->vm_ops && vma->vm_ops->close) > + vma->vm_ops->close(vma); > unmap_and_free_vma: > fput(vma->vm_file); > vma->vm_file = NULL; The fix looks right to me but I'm not an mm expert. FWIW: Reviewed-by: Catalin Marinas