* [patch 11/12] sound/oss/emu10k1/* - compile warning cleanup
@ 2005-03-05 15:35 domen
2005-03-07 0:52 ` Andrew Morton
2005-03-07 0:54 ` Andrew Morton
0 siblings, 2 replies; 3+ messages in thread
From: domen @ 2005-03-05 15:35 UTC (permalink / raw)
To: akpm; +Cc: linux-kernel, domen, yrgrknmxpzlk
compile warning cleanup - handle copy_to/from_user error
returns
Signed-off-by: Stephen Biggs <yrgrknmxpzlk@gawab.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
kj-domen/sound/oss/emu10k1/cardwi.c | 13 ++++++++++---
kj-domen/sound/oss/emu10k1/passthrough.c | 12 ++++++++----
2 files changed, 18 insertions(+), 7 deletions(-)
diff -puN sound/oss/emu10k1/cardwi.c~return_code-sound_oss_emu10k1 sound/oss/emu10k1/cardwi.c
--- kj/sound/oss/emu10k1/cardwi.c~return_code-sound_oss_emu10k1 2005-03-05 16:13:11.000000000 +0100
+++ kj-domen/sound/oss/emu10k1/cardwi.c 2005-03-05 16:13:11.000000000 +0100
@@ -306,8 +306,12 @@ void emu10k1_wavein_getxfersize(struct w
static void copy_block(u8 __user *dst, u8 * src, u32 str, u32 len, u8 cov)
{
- if (cov == 1)
- __copy_to_user(dst, src + str, len);
+ if (cov == 1) {
+ if (__copy_to_user(dst, src + str, len)) {
+ printk( KERN_ERR "emu10k1: %s: copy_to_user failed\n",__FUNCTION__);
+ return;
+ }
+ }
else {
u8 byte;
u32 i;
@@ -316,7 +320,10 @@ static void copy_block(u8 __user *dst, u
for (i = 0; i < len; i++) {
byte = src[2 * i] ^ 0x80;
- __copy_to_user(dst + i, &byte, 1);
+ if (__copy_to_user(dst + i, &byte, 1)) {
+ printk( KERN_ERR "emu10k1: %s: copy_to_user failed\n",__FUNCTION__);
+ return;
+ }
}
}
}
diff -puN sound/oss/emu10k1/passthrough.c~return_code-sound_oss_emu10k1 sound/oss/emu10k1/passthrough.c
--- kj/sound/oss/emu10k1/passthrough.c~return_code-sound_oss_emu10k1 2005-03-05 16:13:11.000000000 +0100
+++ kj-domen/sound/oss/emu10k1/passthrough.c 2005-03-05 16:13:11.000000000 +0100
@@ -162,12 +162,14 @@ ssize_t emu10k1_pt_write(struct file *fi
DPD(3, "prepend size %d, prepending %d bytes\n", pt->prepend_size, needed);
if (count < needed) {
- copy_from_user(pt->buf + pt->prepend_size, buffer, count);
+ if (copy_from_user(pt->buf + pt->prepend_size, buffer, count))
+ return -EFAULT;
pt->prepend_size += count;
DPD(3, "prepend size now %d\n", pt->prepend_size);
return count;
}
- copy_from_user(pt->buf + pt->prepend_size, buffer, needed);
+ if (copy_from_user(pt->buf + pt->prepend_size, buffer, needed))
+ return -EFAULT;
r = pt_putblock(wave_dev, (u16 *) pt->buf, nonblock);
if (r)
return r;
@@ -178,7 +180,8 @@ ssize_t emu10k1_pt_write(struct file *fi
blocks_copied = 0;
while (blocks > 0) {
u16 __user *bufptr = (u16 __user *) buffer + (bytes_copied/2);
- copy_from_user(pt->buf, bufptr, PT_BLOCKSIZE);
+ if (copy_from_user(pt->buf, bufptr, PT_BLOCKSIZE))
+ return -EFAULT;
r = pt_putblock(wave_dev, (u16 *)pt->buf, nonblock);
if (r) {
if (bytes_copied)
@@ -193,7 +196,8 @@ ssize_t emu10k1_pt_write(struct file *fi
i = count - bytes_copied;
if (i) {
pt->prepend_size = i;
- copy_from_user(pt->buf, buffer + bytes_copied, i);
+ if (copy_from_user(pt->buf, buffer + bytes_copied, i))
+ return -EFAULT;
bytes_copied += i;
DPD(3, "filling prepend buffer with %d bytes", i);
}
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 11/12] sound/oss/emu10k1/* - compile warning cleanup
2005-03-05 15:35 [patch 11/12] sound/oss/emu10k1/* - compile warning cleanup domen
@ 2005-03-07 0:52 ` Andrew Morton
2005-03-07 0:54 ` Andrew Morton
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2005-03-07 0:52 UTC (permalink / raw)
To: domen; +Cc: linux-kernel, domen, yrgrknmxpzlk
domen@coderock.org wrote:
>
>
> compile warning cleanup - handle copy_to/from_user error
> returns
If a write() gets a fault it's supposed to return the number of bytes which
it actually wrote, which may be zero.
Still, returning -EFAULT is better than appearing to have succeeded.
> + printk( KERN_ERR "emu10k1: %s: copy_to_user failed\n",__FUNCTION__);
Someone needs to read Documentation/CodingStyle. I'll change these to
printk(KERN_ERR "emu10k1: %s: copy_to_user failed\n", __FUNCTION__);
> + return;
> + }
> + }
> else {
> u8 byte;
> u32 i;
> @@ -316,7 +320,10 @@ static void copy_block(u8 __user *dst, u
>
> for (i = 0; i < len; i++) {
> byte = src[2 * i] ^ 0x80;
> - __copy_to_user(dst + i, &byte, 1);
> + if (__copy_to_user(dst + i, &byte, 1)) {
> + printk( KERN_ERR "emu10k1: %s: copy_to_user failed\n",__FUNCTION__);
> + return;
> + }
> }
> }
> }
> diff -puN sound/oss/emu10k1/passthrough.c~return_code-sound_oss_emu10k1 sound/oss/emu10k1/passthrough.c
> --- kj/sound/oss/emu10k1/passthrough.c~return_code-sound_oss_emu10k1 2005-03-05 16:13:11.000000000 +0100
> +++ kj-domen/sound/oss/emu10k1/passthrough.c 2005-03-05 16:13:11.000000000 +0100
> @@ -162,12 +162,14 @@ ssize_t emu10k1_pt_write(struct file *fi
>
> DPD(3, "prepend size %d, prepending %d bytes\n", pt->prepend_size, needed);
> if (count < needed) {
> - copy_from_user(pt->buf + pt->prepend_size, buffer, count);
> + if (copy_from_user(pt->buf + pt->prepend_size, buffer, count))
> + return -EFAULT;
> pt->prepend_size += count;
> DPD(3, "prepend size now %d\n", pt->prepend_size);
> return count;
> }
> - copy_from_user(pt->buf + pt->prepend_size, buffer, needed);
> + if (copy_from_user(pt->buf + pt->prepend_size, buffer, needed))
> + return -EFAULT;
> r = pt_putblock(wave_dev, (u16 *) pt->buf, nonblock);
> if (r)
> return r;
> @@ -178,7 +180,8 @@ ssize_t emu10k1_pt_write(struct file *fi
> blocks_copied = 0;
> while (blocks > 0) {
> u16 __user *bufptr = (u16 __user *) buffer + (bytes_copied/2);
> - copy_from_user(pt->buf, bufptr, PT_BLOCKSIZE);
> + if (copy_from_user(pt->buf, bufptr, PT_BLOCKSIZE))
> + return -EFAULT;
> r = pt_putblock(wave_dev, (u16 *)pt->buf, nonblock);
> if (r) {
> if (bytes_copied)
> @@ -193,7 +196,8 @@ ssize_t emu10k1_pt_write(struct file *fi
> i = count - bytes_copied;
> if (i) {
> pt->prepend_size = i;
> - copy_from_user(pt->buf, buffer + bytes_copied, i);
> + if (copy_from_user(pt->buf, buffer + bytes_copied, i))
> + return -EFAULT;
> bytes_copied += i;
> DPD(3, "filling prepend buffer with %d bytes", i);
> }
> _
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 11/12] sound/oss/emu10k1/* - compile warning cleanup
2005-03-05 15:35 [patch 11/12] sound/oss/emu10k1/* - compile warning cleanup domen
2005-03-07 0:52 ` Andrew Morton
@ 2005-03-07 0:54 ` Andrew Morton
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2005-03-07 0:54 UTC (permalink / raw)
To: domen; +Cc: linux-kernel, domen, yrgrknmxpzlk
domen@coderock.org wrote:
>
> @@ -316,7 +320,10 @@ static void copy_block(u8 __user *dst, u
>
> for (i = 0; i < len; i++) {
> byte = src[2 * i] ^ 0x80;
> - __copy_to_user(dst + i, &byte, 1);
> + if (__copy_to_user(dst + i, &byte, 1)) {
> + printk( KERN_ERR "emu10k1: %s: copy_to_user failed\n",__FUNCTION__);
> + return;
> + }
> }
This allows users to spam the logs without bounds, which is normally
something we try to avoid. If it's a privileged operation then OK. But it
would be better to propagate an error back to userspace.
I'll drop the patch for now.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-03-07 0:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-03-05 15:35 [patch 11/12] sound/oss/emu10k1/* - compile warning cleanup domen
2005-03-07 0:52 ` Andrew Morton
2005-03-07 0:54 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®