linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iov_iter: fix the uaccess area in copy_compat_iovec_from_user
@ 2021-01-11 17:19 Christoph Hellwig
  2021-01-11 17:50 ` Al Viro
  2021-01-11 20:38 ` David Laight
  0 siblings, 2 replies; 5+ messages in thread
From: Christoph Hellwig @ 2021-01-11 17:19 UTC (permalink / raw)
  To: viro; +Cc: linux-kernel, linux-fsdevel, David Laight

sizeof needs to be called on the compat pointer, not the native one.

Fixes: 89cd35c58bc2 ("iov_iter: transparently handle compat iovecs in import_iovec")
Reported-by: David Laight <David.Laight@ACULAB.COM>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 lib/iov_iter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 1635111c5bd2af..586215aa0f15ce 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1658,7 +1658,7 @@ static int copy_compat_iovec_from_user(struct iovec *iov,
 		(const struct compat_iovec __user *)uvec;
 	int ret = -EFAULT, i;
 
-	if (!user_access_begin(uvec, nr_segs * sizeof(*uvec)))
+	if (!user_access_begin(uvec, nr_segs * sizeof(*uiov)))
 		return -EFAULT;
 
 	for (i = 0; i < nr_segs; i++) {
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] iov_iter: fix the uaccess area in copy_compat_iovec_from_user
@ 2021-01-12  8:19 Christoph Hellwig
  2021-01-16  4:11 ` Al Viro
  0 siblings, 1 reply; 5+ messages in thread
From: Christoph Hellwig @ 2021-01-12  8:19 UTC (permalink / raw)
  To: viro; +Cc: linux-kernel, linux-fsdevel, David Laight

sizeof needs to be called on the compat pointer, not the native one.

Fixes: 89cd35c58bc2 ("iov_iter: transparently handle compat iovecs in import_iovec")
Reported-by: David Laight <David.Laight@ACULAB.COM>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 lib/iov_iter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index 1635111c5bd2af..a21e6a5792c5a5 100644
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -1658,7 +1658,7 @@ static int copy_compat_iovec_from_user(struct iovec *iov,
 		(const struct compat_iovec __user *)uvec;
 	int ret = -EFAULT, i;
 
-	if (!user_access_begin(uvec, nr_segs * sizeof(*uvec)))
+	if (!user_access_begin(uiov, nr_segs * sizeof(*uiov)))
 		return -EFAULT;
 
 	for (i = 0; i < nr_segs; i++) {
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-01-16  4:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-11 17:19 [PATCH] iov_iter: fix the uaccess area in copy_compat_iovec_from_user Christoph Hellwig
2021-01-11 17:50 ` Al Viro
2021-01-11 20:38 ` David Laight
2021-01-12  8:19 Christoph Hellwig
2021-01-16  4:11 ` Al Viro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).