* [patch] kexec: return -EFAULT on copy_to_user() failures
@ 2010-07-29 7:36 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2010-07-29 7:36 UTC (permalink / raw)
To: Andrew Morton
Cc: Hidetoshi Seto, Paul E. McKenney, Eric W. Biederman,
Simon Kagstrom, linux-kernel, kernel-janitors
copy_to/from_user() returns the number of bytes remaining to be copied.
It never returns a negative value. The correct return code is -EFAULT
and not -EIO.
All the callers check for non-zero returns so that's Ok, but the return
code is passed to the user so we should fix this.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 474a847..ab2258b 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -151,8 +151,10 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
image->nr_segments = nr_segments;
segment_bytes = nr_segments * sizeof(*segments);
result = copy_from_user(image->segment, segments, segment_bytes);
- if (result)
+ if (result) {
+ result = -EFAULT;
goto out;
+ }
/*
* Verify we have good destination addresses. The caller is
@@ -827,7 +829,7 @@ static int kimage_load_normal_segment(struct kimage *image,
result = copy_from_user(ptr, buf, uchunk);
kunmap(page);
if (result) {
- result = (result < 0) ? result : -EIO;
+ result = -EFAULT;
goto out;
}
ubytes -= uchunk;
@@ -882,7 +884,7 @@ static int kimage_load_crash_segment(struct kimage *image,
kexec_flush_icache_page(page);
kunmap(page);
if (result) {
- result = (result < 0) ? result : -EIO;
+ result = -EFAULT;
goto out;
}
ubytes -= uchunk;
^ permalink raw reply related [flat|nested] 4+ messages in thread* [patch] kexec: return -EFAULT on copy_to_user() failures
@ 2010-07-29 7:36 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2010-07-29 7:36 UTC (permalink / raw)
To: Andrew Morton
Cc: Hidetoshi Seto, Paul E. McKenney, Eric W. Biederman,
Simon Kagstrom, linux-kernel, kernel-janitors
copy_to/from_user() returns the number of bytes remaining to be copied.
It never returns a negative value. The correct return code is -EFAULT
and not -EIO.
All the callers check for non-zero returns so that's Ok, but the return
code is passed to the user so we should fix this.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 474a847..ab2258b 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -151,8 +151,10 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
image->nr_segments = nr_segments;
segment_bytes = nr_segments * sizeof(*segments);
result = copy_from_user(image->segment, segments, segment_bytes);
- if (result)
+ if (result) {
+ result = -EFAULT;
goto out;
+ }
/*
* Verify we have good destination addresses. The caller is
@@ -827,7 +829,7 @@ static int kimage_load_normal_segment(struct kimage *image,
result = copy_from_user(ptr, buf, uchunk);
kunmap(page);
if (result) {
- result = (result < 0) ? result : -EIO;
+ result = -EFAULT;
goto out;
}
ubytes -= uchunk;
@@ -882,7 +884,7 @@ static int kimage_load_crash_segment(struct kimage *image,
kexec_flush_icache_page(page);
kunmap(page);
if (result) {
- result = (result < 0) ? result : -EIO;
+ result = -EFAULT;
goto out;
}
ubytes -= uchunk;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [patch] kexec: return -EFAULT on copy_to_user() failures
2010-07-29 7:36 ` Dan Carpenter
@ 2010-07-29 7:58 ` Américo Wang
-1 siblings, 0 replies; 4+ messages in thread
From: Américo Wang @ 2010-07-29 7:58 UTC (permalink / raw)
To: Dan Carpenter, Andrew Morton, Hidetoshi Seto, Paul E. McKenney,
Eric W. Biederman, Simon Kagstrom, linux-kernel, kernel-janitors
On Thu, Jul 29, 2010 at 09:36:10AM +0200, Dan Carpenter wrote:
>copy_to/from_user() returns the number of bytes remaining to be copied.
>It never returns a negative value. The correct return code is -EFAULT
>and not -EIO.
>
>All the callers check for non-zero returns so that's Ok, but the return
>code is passed to the user so we should fix this.
>
>Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
>
>diff --git a/kernel/kexec.c b/kernel/kexec.c
>index 474a847..ab2258b 100644
>--- a/kernel/kexec.c
>+++ b/kernel/kexec.c
>@@ -151,8 +151,10 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
> image->nr_segments = nr_segments;
> segment_bytes = nr_segments * sizeof(*segments);
> result = copy_from_user(image->segment, segments, segment_bytes);
>- if (result)
>+ if (result) {
>+ result = -EFAULT;
> goto out;
>+ }
>
> /*
> * Verify we have good destination addresses. The caller is
>@@ -827,7 +829,7 @@ static int kimage_load_normal_segment(struct kimage *image,
> result = copy_from_user(ptr, buf, uchunk);
> kunmap(page);
> if (result) {
>- result = (result < 0) ? result : -EIO;
>+ result = -EFAULT;
> goto out;
> }
> ubytes -= uchunk;
>@@ -882,7 +884,7 @@ static int kimage_load_crash_segment(struct kimage *image,
> kexec_flush_icache_page(page);
> kunmap(page);
> if (result) {
>- result = (result < 0) ? result : -EIO;
>+ result = -EFAULT;
> goto out;
> }
> ubytes -= uchunk;
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch] kexec: return -EFAULT on copy_to_user() failures
@ 2010-07-29 7:58 ` Américo Wang
0 siblings, 0 replies; 4+ messages in thread
From: Américo Wang @ 2010-07-29 7:58 UTC (permalink / raw)
To: Dan Carpenter, Andrew Morton, Hidetoshi Seto, Paul E. McKenney,
Eric W. Biederman, Simon Kagstrom, linux-kernel, kernel-janitors
On Thu, Jul 29, 2010 at 09:36:10AM +0200, Dan Carpenter wrote:
>copy_to/from_user() returns the number of bytes remaining to be copied.
>It never returns a negative value. The correct return code is -EFAULT
>and not -EIO.
>
>All the callers check for non-zero returns so that's Ok, but the return
>code is passed to the user so we should fix this.
>
>Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
>
>diff --git a/kernel/kexec.c b/kernel/kexec.c
>index 474a847..ab2258b 100644
>--- a/kernel/kexec.c
>+++ b/kernel/kexec.c
>@@ -151,8 +151,10 @@ static int do_kimage_alloc(struct kimage **rimage, unsigned long entry,
> image->nr_segments = nr_segments;
> segment_bytes = nr_segments * sizeof(*segments);
> result = copy_from_user(image->segment, segments, segment_bytes);
>- if (result)
>+ if (result) {
>+ result = -EFAULT;
> goto out;
>+ }
>
> /*
> * Verify we have good destination addresses. The caller is
>@@ -827,7 +829,7 @@ static int kimage_load_normal_segment(struct kimage *image,
> result = copy_from_user(ptr, buf, uchunk);
> kunmap(page);
> if (result) {
>- result = (result < 0) ? result : -EIO;
>+ result = -EFAULT;
> goto out;
> }
> ubytes -= uchunk;
>@@ -882,7 +884,7 @@ static int kimage_load_crash_segment(struct kimage *image,
> kexec_flush_icache_page(page);
> kunmap(page);
> if (result) {
>- result = (result < 0) ? result : -EIO;
>+ result = -EFAULT;
> goto out;
> }
> ubytes -= uchunk;
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-07-29 7:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-29 7:36 [patch] kexec: return -EFAULT on copy_to_user() failures Dan Carpenter
2010-07-29 7:36 ` Dan Carpenter
2010-07-29 7:58 ` Américo Wang
2010-07-29 7:58 ` Américo Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.