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 308C7C5B549 for ; Wed, 4 Jun 2025 13:23:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C14316B05EB; Wed, 4 Jun 2025 09:23:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BC3FE6B05ED; Wed, 4 Jun 2025 09:23:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB2E66B05EE; Wed, 4 Jun 2025 09:23:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8D2416B05EB for ; Wed, 4 Jun 2025 09:23:46 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 443071A157A for ; Wed, 4 Jun 2025 13:23:46 +0000 (UTC) X-FDA: 83517785652.16.29942EB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf22.hostedemail.com (Postfix) with ESMTP id A8E6AC0004 for ; Wed, 4 Jun 2025 13:23:43 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="ELu2/T5X"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749043423; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3xww6rsG/Rs20JT8s4hDiVuCO7S3KnAU+7K5dPc6U7A=; b=KXJUNNCu007l+TP40qItAPm4w8/IAMvhSRU9AZfBmkSe1UwkEt4mQ1gb6xCSciimIQtKzH IQUpe8IroLudmS8mgusITJcnFdesuwp9Kd9KFrBsWNAFa3l/pyb5EjruAVg00R81viXBQr 7A2UM94AxK+b9JgPcOEpLTiQL9+MTvs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749043423; a=rsa-sha256; cv=none; b=7cugPz3pnFRy7+hMg/TMI5Xa6qgrbZTZb6hYtkGH0XEiHQqGHqZUYQoALF2Q9BwO4aFrQ9 oU/hk48BRbinU5T7qFgubPdguyKEfiqkOjCLr8XlK2eykpcOedlXVToOYYFFTC0Iw9iK8i UcTUY8wNVnGl4VIED/LhGhWMMZxjvb4= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="ELu2/T5X"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749043423; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=3xww6rsG/Rs20JT8s4hDiVuCO7S3KnAU+7K5dPc6U7A=; b=ELu2/T5X2nR2KzxzG2fP1vcffEzbU3VDXPcQ6YaSvB8Ylak/UHH3HgeMePUjBQszZpK+7F vNGf8fi7rgz8IVeb1uff/EG/RE9HCdcOxYsZLUYQ9/GjS5WO91B/+nhIdk/Wx4iCMNT6u9 Zcu++rHH39T+CeB6QTbEhPqRQym2wgg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-0ipRy82eMJSU9V_j0K4ZCQ-1; Wed, 04 Jun 2025 09:23:42 -0400 X-MC-Unique: 0ipRy82eMJSU9V_j0K4ZCQ-1 X-Mimecast-MFC-AGG-ID: 0ipRy82eMJSU9V_j0K4ZCQ_1749043421 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-450cf229025so19906655e9.1 for ; Wed, 04 Jun 2025 06:23:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749043420; x=1749648220; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=3xww6rsG/Rs20JT8s4hDiVuCO7S3KnAU+7K5dPc6U7A=; b=LlZJ2weqEgdNIXb3XFENgjpWIPS+o400+Lbtgu2BLgkG9IpYDqG0GvaenZOhO4/rQD JZhKZBch5w5qlWT2hXrz+V+u2eDjp2/LWgDcoHTrjtloOnYu2zejwVLVaWE+rlSv3wav mKiiUKamCg57pbc39NVShgyMyM6j72bORRUDGiCZIWqjMZWwoX/hJL3WyLaC19gjH62f Fz7j3eMgjE704gYb/wRh44AfywPrpiZVat1ImSrJ77kdBASGVdOscRwQEZORd4w8XqyC uj36jKAf7Y+1mQbsgZHw/+stX0S9CcvosmWGyUtIRpdVB3QD9xT5yZs11oy5kzxT0XwN XN+A== X-Gm-Message-State: AOJu0YyJVrM3g6RFZibZdjki9N2DwNiGpiUSVggyEclaDMulRo9zDlCf MbxA4e2bqZqMIASLz+2y8gvJUe6WVTdvF4xNMREUEbIy1f0YsUiyAohyWpi/d1inaCkk7KbyrhO 2e1ENhX8qxWpLWW85EdWDZTtyrzKaDNxQGA7EjHcqMONj+ZqiikAI X-Gm-Gg: ASbGnctymQBYp2MFjcMoUj3mpbTUtg0sXLB0yx1oymN5ZE+8nV1fDCrbu9QPEINryJT DFVdpVAwlLra8wU9rB8etvtdTgX1T2pkL4Y4RtapvSEWd9HfrohNv8ABQvq7ri2b2RTinlZke9l Rd/NPag0LMOeDxJ8Vt2NTCAl/umZpATVglFgmV+Ceky3vw8pdqPmnOOrJcp8DKYsqeRsAY8LX1d TeBaKiRZBohbPlmhgyW79SdQFOkQq7u9vPK+cPeZzw/zW9QWpa/Zn87yFWnHld7eCZSCj5lEK7D 4kNTe6JVFwqIkzYY2fHWgLgLjhWSQPuhAbrN9tUT0EJ6BMpDrTQurR9lrV/taml7VrvGATwaYjG PdBCuY6wttH+IZNxQ7thjS2YutlPPzqKBk3kjF/k= X-Received: by 2002:a05:600c:35d4:b0:43c:f44c:72a6 with SMTP id 5b1f17b1804b1-451f0a63602mr24381235e9.2.1749043420602; Wed, 04 Jun 2025 06:23:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFt1y4qRpeycuYRvcBiJBXWsI8Xumomuv0jyE3q2dCGUmvlFOrwHFLD+Jf3Br7pU3KswUcwzA== X-Received: by 2002:a05:600c:35d4:b0:43c:f44c:72a6 with SMTP id 5b1f17b1804b1-451f0a63602mr24380875e9.2.1749043420071; Wed, 04 Jun 2025 06:23:40 -0700 (PDT) Received: from ?IPV6:2003:d8:2f1b:b800:6fdb:1af2:4fbd:1fdf? (p200300d82f1bb8006fdb1af24fbd1fdf.dip0.t-ipconnect.de. [2003:d8:2f1b:b800:6fdb:1af2:4fbd:1fdf]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4efe5b92bsm21434591f8f.9.2025.06.04.06.23.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Jun 2025 06:23:39 -0700 (PDT) Message-ID: <84cf5418-42e9-4ec5-bd87-17ba91995c47@redhat.com> Date: Wed, 4 Jun 2025 15:23:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] userfaultfd: prevent unregistering VMAs through a different userfaultfd To: Tal Zussman , Andrew Morton , Peter Xu , "Jason A. Donenfeld" , Alexander Viro , Christian Brauner , Jan Kara , Pavel Emelyanov , Andrea Arcangeli Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org References: <20250603-uffd-fixes-v1-0-9c638c73f047@columbia.edu> <20250603-uffd-fixes-v1-2-9c638c73f047@columbia.edu> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250603-uffd-fixes-v1-2-9c638c73f047@columbia.edu> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: VYuENuswtAVAo8FjEM6eeuD1keyTCfydmJCBsW9EQhw_1749043421 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A8E6AC0004 X-Stat-Signature: i4bw5f5co9y7ybe8nx8qd4q5m69y99ds X-Rspam-User: X-HE-Tag: 1749043423-777714 X-HE-Meta: U2FsdGVkX18FJQOXbnW0UT1OTzDjOL31D51iyVd04cMst5BNIqATRlMNAL2nfOYtpURvz5vn9mbUECjr4o7brANKwEgEi4X4t+IzmgrofTYGszB/fjqD0II6EYUuvf0gYRAVnsFo7KDF+d+uhrj/Q7Eb1MyGdOzcULIv0hKbyD+m8/UhlDzYZLDy1+8wF05VD964AATdNO618mRNlBHZkrsRL3ejMXL/2goShDKsjFhJdumcere2p4/C9ucxj5ND208pudvw1MghpJ9Ce8D+Ype5e82vXOynGmpUanx5axFf/I8cWphqucw1eRJ9MNWcWmZnu1aWO9tMYtzCNUQlCkhDoduMZ14ndFv8D8sTGP5IhTO9pz8aH65f5jUjBQv2AS03C+PTDO4Yit5hDa9+ciVNr9dMAWb7ISYjNkyXnJx/gTu9CpIjjfHiTmYaXmxL9p87+BxVjcVw0meLJsodsaAicUKYVUMc3OE6zw4lr0NDhJnxWroH8f3XstI07BGUfoChC5d9JdjYP0T8xQKURT/kcIwIbblw7kfaarJ5EgOx4t1uD5uEsiI1n6tfX75eAlrfAVJDlNf0dXtR+AkJi6anOzuPsmPU4LbTM2iHhmA2Sw4oaJXIyRiKjvsQqbjurDeHkOMTmS4Cl5oqM65BWpRvk7jMcNTh8QK3MazQwt7OY9L7pWzexPB6alLOyzXfbnz4mmQ7r0oe6lABn9r61QvRdpOEapEmTnZrVIoEWeZ60fEXg1PxAYGSqbkJ1nRwKB0gPuA/UkJpVx1bOx0KxsaYQdjJgFrbK3J0zX8ghimhQxBSe4RpniB8czZr73G/OtrJXGWfEbInP/AgO4XvoVHYosVcm0GhIHd3L80k7WK4hWYguJO4dazktY3C0aXFhOCBroN4cugtFl6SXGUL596qRhT/7AC6/bivR25dU3pCsiTKzpIhoxYGbfu7WfRpdDHUWZ/4jepciH6Rn5t H8shfC5M r8VvA64kpXAJGySJMyL6OgytzyLuWZ9FGW1t9eZQ0azhGBst22zWkX65bMbLuvxETMhg8DavhmyAt6Zu7kv1/gbm30APf4mxiYVhvucXRbqPnhpk3/qGVjp65OfY4ye2Tiv/bIRzED+erv2kZZY+XhDI7aexPcuxIV9iqKCJAK6iz0I/t2oq/85pSJRYtzQWQaejeOxkPuIZuJ2D8EHwAfX/m0UtjC9tLhdDUv2uvWDiHyElOH9WCa1gAYJ9voucZDu4wByffWXKxfNfd4cBUJPU0NtxmotyHxtL1CC+54CPgR/nwH1MZVPcNVL6zMKv8G8DN+MvEgAsIX11P0+yjrNGlmOydlbQRKjfiuWbh8gp2S3QLE7NJtVGdHA+zFhvSfHRln72umgaQ588WiKKzufr4kQ== 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: List-Subscribe: List-Unsubscribe: On 04.06.25 00:14, Tal Zussman wrote: > Currently, a VMA registered with a uffd can be unregistered through a > different uffd asssociated with the same mm_struct. > > Change this behavior to be stricter by requiring VMAs to be unregistered > through the same uffd they were registered with. > > While at it, correct the comment for the no userfaultfd case. This seems > to be a copy-paste artifact from the analagous userfaultfd_register() > check. I consider it a BUG that should be fixed. Hoping Peter can share his opinion. > > Fixes: 86039bd3b4e6 ("userfaultfd: add new syscall to provide memory externalization") > Signed-off-by: Tal Zussman > --- > fs/userfaultfd.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c > index 22f4bf956ba1..9289e30b24c4 100644 > --- a/fs/userfaultfd.c > +++ b/fs/userfaultfd.c > @@ -1477,6 +1477,16 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, > if (!vma_can_userfault(cur, cur->vm_flags, wp_async)) > goto out_unlock; > > + /* > + * Check that this vma isn't already owned by a different > + * userfaultfd. This provides for more strict behavior by > + * preventing a VMA registered with a userfaultfd from being > + * unregistered through a different userfaultfd. > + */ > + if (cur->vm_userfaultfd_ctx.ctx && > + cur->vm_userfaultfd_ctx.ctx != ctx) > + goto out_unlock; So we allow !cur->vm_userfaultfd_ctx.ctx to allow unregistering when there was nothing registered. A bit weird to set "found = true" in that case. Maybe it's fine, just raising it ... > + > found = true; > } for_each_vma_range(vmi, cur, end); > BUG_ON(!found); > @@ -1491,10 +1501,11 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, > cond_resched(); > > BUG_ON(!vma_can_userfault(vma, vma->vm_flags, wp_async)); > + BUG_ON(vma->vm_userfaultfd_ctx.ctx && > + vma->vm_userfaultfd_ctx.ctx != ctx); > No new BUG_ON please. VM_WARN_ON_ONCE() if we really care. After all, we checked this above ... > /* > - * Nothing to do: this vma is already registered into this > - * userfaultfd and with the right tracking mode too. > + * Nothing to do: this vma is not registered with userfaultfd. > */ > if (!vma->vm_userfaultfd_ctx.ctx) > goto skip; > -- Cheers, David / dhildenb