From nobody Tue Apr 7 05:44:52 2026 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 0EC61381AEF; Mon, 16 Mar 2026 08:53:12 +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=1773651192; cv=none; b=UWvV0KO7VKyBSuSjeR9sHpxPOzmL0ZAuget0dojyFnWgGvQ9CeEGT/3K0fBdwqfk8u/OlBEU/b7bQIFqkjBBkeJFzCRiZ7SlsA3wQuDd2bp4EdQPC6/eaqH3Vzt+8j3FkENjDR0AQZ5arVKufOXWpva5pUlQGL0qPi/Xek4ObHc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773651192; c=relaxed/simple; bh=I1uaLMldiZY2koFxRrPf+LpEtWYgFR/6MsjJC4qQH2M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=S1+XJsw8tvMzfnFJ8AbVyqeSZr5SgX1vpC/8fx5MFx71TCvUs02tf9NPBr9o8FaSLEBx24aoSKFvDcQYRQpV1cA0KrhmiT2R0T73OEXDF1SnBFNH2nikjjhbI2h9JuwTcBrwT9zG024kMk+LuFy963+kTQdLCDU4OgfITl/vUVM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GSfV2eLP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GSfV2eLP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22704C19421; Mon, 16 Mar 2026 08:53:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773651191; bh=I1uaLMldiZY2koFxRrPf+LpEtWYgFR/6MsjJC4qQH2M=; h=From:To:Cc:Subject:Date:From; b=GSfV2eLPvHLKgvMEMyBQhPnsmPn4eWO77IBVzuwGWVCDx0FT2oIw2nu/eYKzkj594 hWSRI5k0Iz5GgOrG5VXKvSUHyOhcaXgPfK0GeirYSW6njf+zTCLi0Y9LgxIrI19nys Py+6xlkHxaHBD7PAjvkaL7GBvuGAD9YBWh/E8PYha3ZVm1Vo2robfVwVUB0quzDbZH FfwtqKbj0d8h62WVa2oBndcO1/daGactGMTsOVZaT1hRLVT329j0m3bqgp3SvAZuFS Lf22kGeOuK2Jkui9DQZgsMCmFu8nIVsWmvMVoHGX6zdya2Fyw8wjjn8XhqOtej95ch 9I28JH0ShguWA== From: "Christophe Leroy (CS GROUP)" To: Alexander Viro , Christian Brauner , Jan Kara , Linus Torvalds , Thomas Gleixner , David Laight Cc: "Christophe Leroy (CS GROUP)" , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] fs: Replace user_access_{begin/end} by scoped user access Date: Mon, 16 Mar 2026 09:52:30 +0100 Message-ID: <23f19c88e763beb852a4891b2a908890bdd01b66.1773651096.git.chleroy@kernel.org> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=8625; i=chleroy@kernel.org; h=from:subject:message-id; bh=I1uaLMldiZY2koFxRrPf+LpEtWYgFR/6MsjJC4qQH2M=; b=owGbwMvMwCV2d0KB2p7V54MZT6slMWRuP3JurVPikWnCbB7sXzW3GEVbX+/58N8i/1hj7cJu3 VkHns9w7ShlYRDjYpAVU2Q5/p9714yuL6n5U3fpw8xhZQIZwsDFKQATyVrH8M9q0Q7B7A+1Vw8u lT+x8fHB6wsS03bdY+Nx6q9nbI7T+D2L4X+58uXQv0s8tpUGMdjWV0342++7fZZfESvD5VMbC0V zzrABAA== X-Developer-Key: i=chleroy@kernel.org; a=openpgp; fpr=10FFE6F8B390DE17ACC2632368A92FEB01B8DD78 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Scoped user access reduces code complexity and seamlessly bring masked user access on architectures that support it. Replace user_access_begin/user_access_end blocks by scoped user access. Signed-off-by: Christophe Leroy (CS GROUP) --- v2: - Fix build failure with CONFIG_COMPAT - Handled checkpatch.pl output v3: - Fix again build failure with CONFIG_COMPAT. I was obviously too tired whe= n I sent out v2. --- fs/readdir.c | 94 +++++++++++++++++++++------------------------------- fs/select.c | 35 ++++++++----------- 2 files changed, 51 insertions(+), 78 deletions(-) diff --git a/fs/readdir.c b/fs/readdir.c index 73707b6816e9..644e2b69ae62 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -198,18 +198,14 @@ static bool fillonedir(struct dir_context *ctx, const= char *name, int namlen, } buf->result++; dirent =3D buf->dirent; - if (!user_write_access_begin(dirent, - (unsigned long)(dirent->d_name + namlen + 1) - - (unsigned long)dirent)) - goto efault; - unsafe_put_user(d_ino, &dirent->d_ino, efault_end); - unsafe_put_user(offset, &dirent->d_offset, efault_end); - unsafe_put_user(namlen, &dirent->d_namlen, efault_end); - unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault_end); - user_write_access_end(); + scoped_user_write_access_size(dirent, (unsigned long)(dirent->d_name + na= mlen + 1) - + (unsigned long)dirent, efault) { + unsafe_put_user(d_ino, &dirent->d_ino, efault); + unsafe_put_user(offset, &dirent->d_offset, efault); + unsafe_put_user(namlen, &dirent->d_namlen, efault); + unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault); + } return true; -efault_end: - user_write_access_end(); efault: buf->result =3D -EFAULT; return false; @@ -287,23 +283,19 @@ static bool filldir(struct dir_context *ctx, const ch= ar *name, int namlen, return false; dirent =3D buf->current_dir; prev =3D (void __user *) dirent - prev_reclen; - if (!user_write_access_begin(prev, reclen + prev_reclen)) - goto efault; - - /* This might be 'dirent->d_off', but if so it will get overwritten */ - unsafe_put_user(offset, &prev->d_off, efault_end); - unsafe_put_user(d_ino, &dirent->d_ino, efault_end); - unsafe_put_user(reclen, &dirent->d_reclen, efault_end); - unsafe_put_user(d_type, (char __user *) dirent + reclen - 1, efault_end); - unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault_end); - user_write_access_end(); + scoped_user_write_access_size(prev, reclen + prev_reclen, efault) { + /* This might be 'dirent->d_off', but if so it will get overwritten */ + unsafe_put_user(offset, &prev->d_off, efault); + unsafe_put_user(d_ino, &dirent->d_ino, efault); + unsafe_put_user(reclen, &dirent->d_reclen, efault); + unsafe_put_user(d_type, (char __user *)dirent + reclen - 1, efault); + unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault); + } =20 buf->current_dir =3D (void __user *)dirent + reclen; buf->prev_reclen =3D reclen; ctx->count -=3D reclen; return true; -efault_end: - user_write_access_end(); efault: buf->error =3D -EFAULT; return false; @@ -371,24 +363,20 @@ static bool filldir64(struct dir_context *ctx, const = char *name, int namlen, return false; dirent =3D buf->current_dir; prev =3D (void __user *)dirent - prev_reclen; - if (!user_write_access_begin(prev, reclen + prev_reclen)) - goto efault; - - /* This might be 'dirent->d_off', but if so it will get overwritten */ - unsafe_put_user(offset, &prev->d_off, efault_end); - unsafe_put_user(ino, &dirent->d_ino, efault_end); - unsafe_put_user(reclen, &dirent->d_reclen, efault_end); - unsafe_put_user(d_type, &dirent->d_type, efault_end); - unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault_end); - user_write_access_end(); + scoped_user_write_access_size(prev, reclen + prev_reclen, efault) { + /* This might be 'dirent->d_off', but if so it will get overwritten */ + unsafe_put_user(offset, &prev->d_off, efault); + unsafe_put_user(ino, &dirent->d_ino, efault); + unsafe_put_user(reclen, &dirent->d_reclen, efault); + unsafe_put_user(d_type, &dirent->d_type, efault); + unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault); + } =20 buf->prev_reclen =3D reclen; buf->current_dir =3D (void __user *)dirent + reclen; ctx->count -=3D reclen; return true; =20 -efault_end: - user_write_access_end(); efault: buf->error =3D -EFAULT; return false; @@ -460,18 +448,14 @@ static bool compat_fillonedir(struct dir_context *ctx= , const char *name, } buf->result++; dirent =3D buf->dirent; - if (!user_write_access_begin(dirent, - (unsigned long)(dirent->d_name + namlen + 1) - - (unsigned long)dirent)) - goto efault; - unsafe_put_user(d_ino, &dirent->d_ino, efault_end); - unsafe_put_user(offset, &dirent->d_offset, efault_end); - unsafe_put_user(namlen, &dirent->d_namlen, efault_end); - unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault_end); - user_write_access_end(); + scoped_user_write_access_size(dirent, (unsigned long)(dirent->d_name + na= mlen + 1) - + (unsigned long)dirent, efault) { + unsafe_put_user(d_ino, &dirent->d_ino, efault); + unsafe_put_user(offset, &dirent->d_offset, efault); + unsafe_put_user(namlen, &dirent->d_namlen, efault); + unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault); + } return true; -efault_end: - user_write_access_end(); efault: buf->result =3D -EFAULT; return false; @@ -543,22 +527,18 @@ static bool compat_filldir(struct dir_context *ctx, c= onst char *name, int namlen return false; dirent =3D buf->current_dir; prev =3D (void __user *) dirent - prev_reclen; - if (!user_write_access_begin(prev, reclen + prev_reclen)) - goto efault; - - unsafe_put_user(offset, &prev->d_off, efault_end); - unsafe_put_user(d_ino, &dirent->d_ino, efault_end); - unsafe_put_user(reclen, &dirent->d_reclen, efault_end); - unsafe_put_user(d_type, (char __user *) dirent + reclen - 1, efault_end); - unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault_end); - user_write_access_end(); + scoped_user_write_access_size(prev, reclen + prev_reclen, efault) { + unsafe_put_user(offset, &prev->d_off, efault); + unsafe_put_user(d_ino, &dirent->d_ino, efault); + unsafe_put_user(reclen, &dirent->d_reclen, efault); + unsafe_put_user(d_type, (char __user *)dirent + reclen - 1, efault); + unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault); + } =20 buf->prev_reclen =3D reclen; buf->current_dir =3D (void __user *)dirent + reclen; ctx->count -=3D reclen; return true; -efault_end: - user_write_access_end(); efault: buf->error =3D -EFAULT; return false; diff --git a/fs/select.c b/fs/select.c index e0244dbe4429..75978b18f48f 100644 --- a/fs/select.c +++ b/fs/select.c @@ -1004,17 +1004,17 @@ static int do_sys_poll(struct pollfd __user *ufds, = unsigned int nfds, fdcount =3D do_poll(head, &table, end_time); poll_freewait(&table); =20 - if (!user_write_access_begin(ufds, nfds * sizeof(*ufds))) - goto out_fds; + scoped_user_write_access_size(ufds, nfds * sizeof(*ufds), out_fds) { + struct pollfd __user *_ufds =3D ufds; =20 - for (walk =3D head; walk; walk =3D walk->next) { - struct pollfd *fds =3D walk->entries; - unsigned int j; + for (walk =3D head; walk; walk =3D walk->next) { + struct pollfd *fds =3D walk->entries; + unsigned int j; =20 - for (j =3D walk->len; j; fds++, ufds++, j--) - unsafe_put_user(fds->revents, &ufds->revents, Efault); - } - user_write_access_end(); + for (j =3D walk->len; j; fds++, _ufds++, j--) + unsafe_put_user(fds->revents, &_ufds->revents, out_fds); + } + } =20 err =3D fdcount; out_fds: @@ -1026,11 +1026,6 @@ static int do_sys_poll(struct pollfd __user *ufds, u= nsigned int nfds, } =20 return err; - -Efault: - user_write_access_end(); - err =3D -EFAULT; - goto out_fds; } =20 static long do_restart_poll(struct restart_block *restart_block) @@ -1338,15 +1333,13 @@ static inline int get_compat_sigset_argpack(struct = compat_sigset_argpack *to, struct compat_sigset_argpack __user *from) { if (from) { - if (!user_read_access_begin(from, sizeof(*from))) - return -EFAULT; - unsafe_get_user(to->p, &from->p, Efault); - unsafe_get_user(to->size, &from->size, Efault); - user_read_access_end(); + scoped_user_read_access(from, efault) { + unsafe_get_user(to->p, &from->p, efault); + unsafe_get_user(to->size, &from->size, efault); + } } return 0; -Efault: - user_read_access_end(); +efault: return -EFAULT; } =20 --=20 2.49.0