From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E59E161 for ; Sat, 22 Jun 2024 01:02:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719018179; cv=none; b=Dzn4tg2sjB4DylzGo258lIT/7+Xvb+PpzPWw2j/pL398mIjdYjsUhMIH/NC1CpEcju5dnAhY8sOv7vgGnb1PkOp3/tsepy8bcHAtgJiUO1PzHAfqRRUz1jfD3ih5c/Q+hMGwIw9+uzYeznTUHAvYcwkPVToWWQdYX7MOmfKHWnI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719018179; c=relaxed/simple; bh=PrDG4AhCFS/PLmRKlDeBggufhO1ZsZ4XYaETTnlliIA=; h=Date:To:From:Subject:Message-Id; b=nwpTdGx4lh0g92Z8UVJHfnO0ryHNocbtRi/5sVSErLRasIjXpHXbM0w1iKEEt9ylupLnrFIiqQWzx74JalGMajTyVwshnXcuOWI3gWbG5Q5+nitbkW2jW3Q8ivXIwFqlSC6Dw62Y9IHbGud2a1uZNQfDhervWlsWcks//x3K8BY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=QVNH3kNP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="QVNH3kNP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 610EEC2BBFC; Sat, 22 Jun 2024 01:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1719018178; bh=PrDG4AhCFS/PLmRKlDeBggufhO1ZsZ4XYaETTnlliIA=; h=Date:To:From:Subject:From; b=QVNH3kNPkplNXmHTXzLjhktmOfbmNfagxRYRDHNCBoZgqrmiUG7SzaTptxmZymPal uh48yYN2XKLOLwO2cUqOrYJeaPAyf3UCBkGGCI6TNz1nt5o8dmzDilAS1zLQleT8ab gJgm4G4n3U3gTqrZZy2EzTNbx2OaI1jyIvmYl+d0= Date: Fri, 21 Jun 2024 18:02:57 -0700 To: mm-commits@vger.kernel.org,viro@zeniv.linux.org.uk,shuah@kernel.org,shli@fb.com,rppt@linux.vnet.ibm.com,raquini@redhat.com,peterx@redhat.com,jack@suse.cz,brauner@kernel.org,aarcange@redhat.com,audra@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: + fix-userfaultfd_api-to-return-einval-as-expected.patch added to mm-hotfixes-unstable branch Message-Id: <20240622010258.610EEC2BBFC@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm/uffd: fix userfaultfd_api to return EINVAL as expected has been added to the -mm mm-hotfixes-unstable branch. Its filename is fix-userfaultfd_api-to-return-einval-as-expected.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/fix-userfaultfd_api-to-return-einval-as-expected.patch This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Audra Mitchell Subject: mm/uffd: fix userfaultfd_api to return EINVAL as expected Date: Fri, 21 Jun 2024 14:12:22 -0400 Currently if we request a feature that is not set in the Kernel config we fail silently and return all the available features. However, the man page indicates we should return an EINVAL. We need to fix this issue since we can end up with a Kernel warning should a program request the feature UFFD_FEATURE_WP_UNPOPULATED on a kernel with the config not set with this feature. [ 200.812896] WARNING: CPU: 91 PID: 13634 at mm/memory.c:1660 zap_pte_range+0x43d/0x660 [ 200.820738] Modules linked in: [ 200.869387] CPU: 91 PID: 13634 Comm: userfaultfd Kdump: loaded Not tainted 6.9.0-rc5+ #8 [ 200.877477] Hardware name: Dell Inc. PowerEdge R6525/0N7YGH, BIOS 2.7.3 03/30/2022 [ 200.885052] RIP: 0010:zap_pte_range+0x43d/0x660 Link: https://lkml.kernel.org/r/20240621181224.3881179-1-audra@redhat.com Fixes: e06f1e1dd499 ("userfaultfd: wp: enabled write protection in userfaultfd API") Signed-off-by: Audra Mitchell Acked-by: Peter Xu Cc: Al Viro Cc: Andrea Arcangeli Cc: Christian Brauner Cc: Jan Kara Cc: Mike Rapoport Cc: Rafael Aquini Cc: Shaohua Li Cc: Shuah Khan Signed-off-by: Andrew Morton --- fs/userfaultfd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/fs/userfaultfd.c~fix-userfaultfd_api-to-return-einval-as-expected +++ a/fs/userfaultfd.c @@ -2057,7 +2057,7 @@ static int userfaultfd_api(struct userfa goto out; features = uffdio_api.features; ret = -EINVAL; - if (uffdio_api.api != UFFD_API || (features & ~UFFD_API_FEATURES)) + if (uffdio_api.api != UFFD_API) goto err_out; ret = -EPERM; if ((features & UFFD_FEATURE_EVENT_FORK) && !capable(CAP_SYS_PTRACE)) @@ -2081,6 +2081,11 @@ static int userfaultfd_api(struct userfa uffdio_api.features &= ~UFFD_FEATURE_WP_UNPOPULATED; uffdio_api.features &= ~UFFD_FEATURE_WP_ASYNC; #endif + + ret = -EINVAL; + if (features & ~uffdio_api.features) + goto err_out; + uffdio_api.ioctls = UFFD_API_IOCTLS; ret = -EFAULT; if (copy_to_user(buf, &uffdio_api, sizeof(uffdio_api))) _ Patches currently in -mm which might be from audra@redhat.com are fix-userfaultfd_api-to-return-einval-as-expected.patch