git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
icn
/
icn.c
diff --git
a/drivers/isdn/icn/icn.c
b/drivers/isdn/icn/icn.c
index
6649f8b
..
1e699bc
100644
(file)
--- a/
drivers/isdn/icn/icn.c
+++ b/
drivers/isdn/icn/icn.c
@@
-1010,7
+1010,8
@@
icn_readstatus(u_char __user *buf, int len, icn_card * card)
for (p = buf, count = 0; count < len; p++, count++) {
if (card->msg_buf_read == card->msg_buf_write)
return count;
for (p = buf, count = 0; count < len; p++, count++) {
if (card->msg_buf_read == card->msg_buf_write)
return count;
- put_user(*card->msg_buf_read++, p);
+ if (put_user(*card->msg_buf_read++, p))
+ return -EFAULT;
if (card->msg_buf_read > card->msg_buf_end)
card->msg_buf_read = card->msg_buf;
}
if (card->msg_buf_read > card->msg_buf_end)
card->msg_buf_read = card->msg_buf;
}
@@
-1518,12
+1519,11
@@
icn_initcard(int port, char *id)
icn_card *card;
int i;
icn_card *card;
int i;
- if (!(card =
(icn_card *) km
alloc(sizeof(icn_card), GFP_KERNEL))) {
+ if (!(card =
kz
alloc(sizeof(icn_card), GFP_KERNEL))) {
printk(KERN_WARNING
"icn: (%s) Could not allocate card-struct.\n", id);
return (icn_card *) 0;
}
printk(KERN_WARNING
"icn: (%s) Could not allocate card-struct.\n", id);
return (icn_card *) 0;
}
- memset((char *) card, 0, sizeof(icn_card));
spin_lock_init(&card->lock);
card->port = port;
card->interface.owner = THIS_MODULE;
spin_lock_init(&card->lock);
card->port = port;
card->interface.owner = THIS_MODULE;