]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
select: Fix unbalanced user_access_end()
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Mon, 13 Jan 2025 08:37:24 +0000 (09:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:46:44 +0000 (12:46 +0100)
[ Upstream commit 344af27715ddbf357cf76978d674428b88f8e92d ]

While working on implementing user access validation on powerpc
I got the following warnings on a pmac32_defconfig build:

  CC      fs/select.o
fs/select.o: warning: objtool: sys_pselect6+0x1bc: redundant UACCESS disable
fs/select.o: warning: objtool: sys_pselect6_time32+0x1bc: redundant UACCESS disable

On powerpc/32s, user_read_access_begin/end() are no-ops, but the
failure path has a user_access_end() instead of user_read_access_end()
which means an access end without any prior access begin.

Replace that user_access_end() by user_read_access_end().

Fixes: 7e71609f64ec ("pselect6() and friends: take handling the combined 6th/7th args into helper")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Link: https://lore.kernel.org/r/a7139e28d767a13e667ee3c79599a8047222ef36.1736751221.git.christophe.leroy@csgroup.eu
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/select.c

index 668a5200503aec4d694b8d440b3719a869ff8744..7ce67428582e6ddd62cd0e0041199b62e7ac7bd6 100644 (file)
@@ -787,7 +787,7 @@ static inline int get_sigset_argpack(struct sigset_argpack *to,
        }
        return 0;
 Efault:
-       user_access_end();
+       user_read_access_end();
        return -EFAULT;
 }
 
@@ -1360,7 +1360,7 @@ static inline int get_compat_sigset_argpack(struct compat_sigset_argpack *to,
        }
        return 0;
 Efault:
-       user_access_end();
+       user_read_access_end();
        return -EFAULT;
 }