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=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL 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 7407EC433B4 for ; Wed, 28 Apr 2021 23:57:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DD32D6143E for ; Wed, 28 Apr 2021 23:57:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD32D6143E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3D2606B006C; Wed, 28 Apr 2021 19:57:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3821E6B006E; Wed, 28 Apr 2021 19:57:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 222BC6B0070; Wed, 28 Apr 2021 19:57:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0066.hostedemail.com [216.40.44.66]) by kanga.kvack.org (Postfix) with ESMTP id 093216B006C for ; Wed, 28 Apr 2021 19:57:14 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B6597181AEF3F for ; Wed, 28 Apr 2021 23:57:13 +0000 (UTC) X-FDA: 78083439546.22.7577EB4 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by imf02.hostedemail.com (Postfix) with ESMTP id 139E940002C3 for ; Wed, 28 Apr 2021 23:56:42 +0000 (UTC) Received: by mail-qv1-f51.google.com with SMTP id x14so8417446qvr.5 for ; Wed, 28 Apr 2021 16:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=vP18S1ZHWifJQd1qEJhx4BgIQRd2/f+YEsAm90MSCG0=; b=XRnStlcsfx70IZEuTEm5juLFCD394BPIw5/IzE7kRGzqj1lWDXgAFyMlkJKviStRsG cKlEEX2kEGfIqG9u8omVgjv7H1uq6VAQ3OgzfOi6VdHLLW3nPijOgdIoFXPVRc0bRM3C fKYpv7iYsRdHIZHeJKwnHdukaTyyRGxUXD79VO0Ki4RjcmxetP2a4GCsnxDIZ6XDF8Ej VPpG/gxqk/SE6t1CTSVLE8VJ7jkBzwpJENXY4klhsziiXvWdOkT463aW/ZEsi+QGF1w6 2vQp56F/ABLIAZpOK/Mp9uCAEn+sosvzG01NWeK7sQUQL//U08Jv0HG4goLz6TQND1tg Kvtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=vP18S1ZHWifJQd1qEJhx4BgIQRd2/f+YEsAm90MSCG0=; b=rKdD257TWjQmQYqQY40wgEXClOfLfQ7M6XB1Qs965D7GNEDel/UWrdSlLMvJ9td1GG +rU5iyw0Mgj7S/+TcKPS0/NCqlqhA0QpEkmu40UK2NF1UjQekPD+qq/zBchaMAagfENT NQF4LMXWhdPpOkmHV4FoPAJn1tAujDsxp81WMBGoTxoepsXZ1NGk1orUFXPDcAMSbpRF J6LEdQfXQkFPKWVCIIbRq5HMvKG9C4uzPI0iIcdcc7eC/51avz6lGSlk9y2d3McCQ2kC +kFYJ4U/XzzfuMcSQJNNc/2ZR/Sfc5ux0Ul9UQ8vjneb2LNOKbavyL1tL7SCTRagyjY4 cOwg== X-Gm-Message-State: AOAM5307q1gyIscj1t/OCUehFEoWsqCKX+aEX8luGyeY+WXXU3Y7ajWZ j6CHu9FtzdgkipVuRYhFh/uW5g== X-Google-Smtp-Source: ABdhPJxZChcfPVDoxcjUyncFnAspzWViOI5AsBvAAIxkWSbXJqJ2hYJJ3Up7TkxTSee0UVQlnjPyvQ== X-Received: by 2002:ad4:5be4:: with SMTP id k4mr32004748qvc.53.1619654231871; Wed, 28 Apr 2021 16:57:11 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id q23sm1188988qtl.25.2021.04.28.16.57.10 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Wed, 28 Apr 2021 16:57:11 -0700 (PDT) Date: Wed, 28 Apr 2021 16:56:59 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Axel Rasmussen cc: Andrea Arcangeli , Andrew Morton , Hugh Dickins , Peter Xu , Lokesh Gidra , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] userfaultfd: release page in error path to avoid BUG_ON In-Reply-To: <20210428230858.348400-1-axelrasmussen@google.com> Message-ID: References: <20210428180109.293606-1-axelrasmussen@google.com> <20210428230858.348400-1-axelrasmussen@google.com> User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Rspamd-Queue-Id: 139E940002C3 X-Stat-Signature: z7bz18ekorabhrxitu9ux4wo6a6pbsrb X-Rspamd-Server: rspam02 Received-SPF: none (google.com>: No applicable sender policy available) receiver=imf02; identity=mailfrom; envelope-from=""; helo=mail-qv1-f51.google.com; client-ip=209.85.219.51 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619654202-650954 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, 28 Apr 2021, Axel Rasmussen wrote: > Consider the following sequence of events: > > 1. Userspace issues a UFFD ioctl, which ends up calling into > shmem_mfill_atomic_pte(). We successfully account the blocks, we > shmem_alloc_page(), but then the copy_from_user() fails. We return > -ENOENT. We don't release the page we allocated. > 2. Our caller detects this error code, tries the copy_from_user() after > dropping the mmap_lock, and retries, calling back into > shmem_mfill_atomic_pte(). > 3. Meanwhile, let's say another process filled up the tmpfs being used. > 4. So shmem_mfill_atomic_pte() fails to account blocks this time, and > immediately returns - without releasing the page. > > This triggers a BUG_ON in our caller, which asserts that the page > should always be consumed, unless -ENOENT is returned. > > To fix this, detect if we have such a "dangling" page when accounting > fails, and if so, release it before returning. > > Fixes: cb658a453b93 ("userfaultfd: shmem: avoid leaking blocks and used blocks in UFFDIO_COPY") > Reported-by: Hugh Dickins > Signed-off-by: Axel Rasmussen Acked-by: Hugh Dickins Thanks! > --- > mm/shmem.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 26c76b13ad23..8def03d3f32a 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -2375,8 +2375,18 @@ static int shmem_mfill_atomic_pte(struct mm_struct *dst_mm, > pgoff_t offset, max_off; > > ret = -ENOMEM; > - if (!shmem_inode_acct_block(inode, 1)) > + if (!shmem_inode_acct_block(inode, 1)) { > + /* > + * We may have got a page, returned -ENOENT triggering a retry, > + * and now we find ourselves with -ENOMEM. Release the page, to > + * avoid a BUG_ON in our caller. > + */ > + if (unlikely(*pagep)) { > + put_page(*pagep); > + *pagep = NULL; > + } > goto out; > + } > > if (!*pagep) { > page = shmem_alloc_page(gfp, info, pgoff); > -- > 2.31.1.498.g6c1eba8ee3d-goog