iov_iter: Mark copy_iovec_from_user() noclone

Peter Zijlstra · Peter Zijlstra · commit 719a937b7003 · 2023-07-10T09:52:28.000+02:00
Extend commit 50f9a76 ("iov_iter: Mark copy_compat_iovec_from_user() noinline") to also cover copy_iovec_from_user(). Different compiler versions cause the same problem on different functions. lib/iov_iter.o: warning: objtool: .altinstr_replacement+0x1f: redundant UACCESS disable lib/iov_iter.o: warning: objtool: iovec_from_user+0x84: call to copy_iovec_from_user.part.0() with UACCESS enabled lib/iov_iter.o: warning: objtool: __import_iovec+0x143: call to copy_iovec_from_user.part.0() with UACCESS enabled Fixes: 50f9a76 ("iov_iter: Mark copy_compat_iovec_from_user() noinline") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lkml.kernel.org/r/20230616124354.GD4253@hirez.programming.kicks-ass.net
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
@@ -1349,7 +1349,7 @@ static __noclone int copy_compat_iovec_from_user(struct iovec *iov,
 	return ret;
 }
 
-static int copy_iovec_from_user(struct iovec *iov,
+static __noclone int copy_iovec_from_user(struct iovec *iov,
 		const struct iovec __user *uiov, unsigned long nr_segs)
 {
 	int ret = -EFAULT;

Original file line number	Diff line number	Diff line change
`@@ -1349,7 +1349,7 @@ static __noclone int copy_compat_iovec_from_user(struct iovec *iov,`
`1349`	`1349`	`return ret;`
`1350`	`1350`	`}`
`1351`	`1351`
`1352`		`-static int copy_iovec_from_user(struct iovec *iov,`
	`1352`	`+static __noclone int copy_iovec_from_user(struct iovec *iov,`
`1353`	`1353`	`const struct iovec __user *uiov, unsigned long nr_segs)`
`1354`	`1354`	`{`
`1355`	`1355`	`int ret = -EFAULT;`