iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] ISDN: correctly handle isdn_writebuf_stub() errors

Browse Source 
isdn_writebuf_stub() forgets to detect memory allocation and uaccess errors.
And when that's fixed, if a error happens the caller will just keep on
looping.

So change the caller to detect the error, and to return it.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jesper Juhl 2006-06-23 02:05:28 -07:00 committed by Linus Torvalds
parent 94a6735cd6
commit d20d04bc9b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/isdn/i4l/isdn_common.c
View File

@ -1177,9 +1177,8 @@ isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off
goto out; goto out;
} }
chidx = isdn_minor2chan(minor); chidx = isdn_minor2chan(minor);
while (isdn_writebuf_stub(drvidx, chidx, buf, count) != count) while ((retval = isdn_writebuf_stub(drvidx, chidx, buf, count)) == 0)
interruptible_sleep_on(&dev->drv[drvidx]->snd_waitq[chidx]); interruptible_sleep_on(&dev->drv[drvidx]->snd_waitq[chidx]);
retval = count;
goto out; goto out;
} }
if (minor <= ISDN_MINOR_CTRLMAX) { if (minor <= ISDN_MINOR_CTRLMAX) {
@ -1951,9 +1950,10 @@ isdn_writebuf_stub(int drvidx, int chan, const u_char __user * buf, int len)
struct sk_buff *skb = alloc_skb(hl + len, GFP_ATOMIC); struct sk_buff *skb = alloc_skb(hl + len, GFP_ATOMIC);
if (!skb) if (!skb)
return 0; return -ENOMEM;
skb_reserve(skb, hl); skb_reserve(skb, hl);
copy_from_user(skb_put(skb, len), buf, len); if (copy_from_user(skb_put(skb, len), buf, len))
return -EFAULT;
ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, 1, skb); ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx, chan, 1, skb);
if (ret <= 0) if (ret <= 0)
dev_kfree_skb(skb); dev_kfree_skb(skb);