Skip to content

Commit 2801478

Browse files
author
Ming Lei
committed
iov_iter: Mark copy_compat_iovec_from_user() noinline
JIRA: https://issues.redhat.com/browse/RHEL-87739 commit 50f9a76 Author: Josh Poimboeuf <jpoimboe@kernel.org> Date: Wed Apr 12 10:46:48 2023 -0600 iov_iter: Mark copy_compat_iovec_from_user() noinline After commit 6376ce56feb6 ("iov_iter: import single vector iovecs as ITER_UBUF"), GCC does an inter-procedural compiler optimization which moves the user_access_begin() out of copy_compat_iovec_from_user() and into its callers: lib/iov_iter.o: warning: objtool: .altinstr_replacement+0x0: redundant UACCESS disable lib/iov_iter.o: warning: objtool: iovec_from_user.part.0+0xc7: call to copy_compat_iovec_from_user.part.0() with UACCESS enabled lib/iov_iter.o: warning: objtool: __import_iovec+0x21d: call to copy_compat_iovec_from_user.part.0() with UACCESS enabled Enforce the "no UACCESS enable across function boundaries" rule by disabling cloning for copy_compat_iovec_from_user(). Fixes: 6376ce56feb6 ("iov_iter: import single vector iovecs as ITER_UBUF") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> https://lkml.kernel.org/lkml/20230327120017.6bb826d7@canb.auug.org.au Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Tested-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Ming Lei <ming.lei@redhat.com>
1 parent a34605b commit 2801478

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/iov_iter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,7 @@ const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags)
17471747
}
17481748
EXPORT_SYMBOL(dup_iter);
17491749

1750-
static int copy_compat_iovec_from_user(struct iovec *iov,
1750+
static __noclone int copy_compat_iovec_from_user(struct iovec *iov,
17511751
const struct iovec __user *uvec, unsigned long nr_segs)
17521752
{
17531753
const struct compat_iovec __user *uiov =

0 commit comments

Comments
 (0)