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=-11.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 63010C433ED for ; Thu, 29 Apr 2021 00:08:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0654761445 for ; Thu, 29 Apr 2021 00:08:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0654761445 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 880126B006E; Wed, 28 Apr 2021 20:08:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8300F6B0070; Wed, 28 Apr 2021 20:08:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A96C6B0071; Wed, 28 Apr 2021 20:08:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0120.hostedemail.com [216.40.44.120]) by kanga.kvack.org (Postfix) with ESMTP id 4D59E6B006E for ; Wed, 28 Apr 2021 20:08:53 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 08C781E0B for ; Thu, 29 Apr 2021 00:08:53 +0000 (UTC) X-FDA: 78083468946.17.0AF1258 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf20.hostedemail.com (Postfix) with ESMTP id DE8AFF7 for ; Thu, 29 Apr 2021 00:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619654931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=r7GVrafhqBt/NzEHPShnR5kpF2aomX40MHGlLdQ6KOU=; b=ZOD2XwjcSHmzu0i2X3r67hbLJUGHAozu39SI7hikymuu/aUW0Z8nYRBHp00F56LGa7PWLb vdQOy+oFEwxF2u9mFqa10OaISWnIc/snMxVsnGQcUi5GkRti9RQG8yD5af6vLk67mPMOl9 leSi2N07W9f9XFBr+qNJ/nDsVaEVcrA= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-525--sVLn_qeOimdcGteIdV4rQ-1; Wed, 28 Apr 2021 20:08:47 -0400 X-MC-Unique: -sVLn_qeOimdcGteIdV4rQ-1 Received: by mail-qk1-f199.google.com with SMTP id s143-20020a3745950000b029028274263008so26715954qka.9 for ; Wed, 28 Apr 2021 17:08:47 -0700 (PDT) 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:message-id:references :mime-version:content-disposition:in-reply-to; bh=r7GVrafhqBt/NzEHPShnR5kpF2aomX40MHGlLdQ6KOU=; b=ivP0oLx2pxtMJ6xD3Euez+euSIsOpGEM8tSKGQ/KIkVZPTBDV03azU+phabXfrBrCD 1758/N7RGB83CBGRC1l4OMwXmXOWAuWiy+6ng9LhDUWEEydDrr6UsRKc99geC7c9RUev nPTVEPblAUCk7Y/fq+KOgM/2Pl39qQRQ9ih2LmULnDS57E23DtqRTuP4x2Pe+9ix/d4/ 0bLW7NxjEwsvyB5XUs9Of4kqeJi3iVM5mVoBPeA4MFs1maX/RAscybAmL+hrddJlN7wL huEUoQ5SVX6ovwRJp3wq4KJRsugGz4Jv8q0b/2Hvpe1dWWR4i8WxJMVsFuGgEY9Npp7T UpkA== X-Gm-Message-State: AOAM533IqFGV7iTVrVgnLDZLr+DrzBGQmzVki7Txih+2kDAEvpkVpxoy vxs81W0pFBuMNTCDnVm4e7BvDodzDXPk+LJtvibstyj0ID3Ov9bWgw/Fb9slZLMtDCcIJu+v5AG bzhhFdoJLAWk= X-Received: by 2002:ac8:7947:: with SMTP id r7mr28544013qtt.104.1619654927363; Wed, 28 Apr 2021 17:08:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQLfa/KlJZWVO0hAU0gE3hKxnxPGdpA0sAAuc1Zb74f4W5OFsDvnexehY7/o3Vt2whfyC1ZQ== X-Received: by 2002:ac8:7947:: with SMTP id r7mr28543999qtt.104.1619654927126; Wed, 28 Apr 2021 17:08:47 -0700 (PDT) Received: from xz-x1 (bras-base-toroon474qw-grc-77-184-145-104-227.dsl.bell.ca. [184.145.104.227]) by smtp.gmail.com with ESMTPSA id a22sm1020526qtp.80.2021.04.28.17.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 17:08:46 -0700 (PDT) Date: Wed, 28 Apr 2021 20:08:45 -0400 From: Peter Xu To: Axel Rasmussen Cc: Andrea Arcangeli , Andrew Morton , Hugh Dickins , 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 Message-ID: <20210429000845.GA8339@xz-x1> References: <20210428180109.293606-1-axelrasmussen@google.com> <20210428230858.348400-1-axelrasmussen@google.com> MIME-Version: 1.0 In-Reply-To: <20210428230858.348400-1-axelrasmussen@google.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: DE8AFF7 X-Stat-Signature: io3d861poomwzo4styro33fth8tsniet Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619654923-717915 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, Apr 28, 2021 at 04:08:58PM -0700, 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 Reviewed-by: Peter Xu Thanks, -- Peter Xu