X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/fd883ff8b15778611731b6e7c9cdacb5470c3901..46e2f34c15f734054295e3a2a2d68828247bcd86:/lincan/src/write.c diff --git a/lincan/src/write.c b/lincan/src/write.c index dccade1..4b65a14 100644 --- a/lincan/src/write.c +++ b/lincan/src/write.c @@ -20,7 +20,7 @@ ssize_t can_write(struct file *file, const char *buffer, size_t length, loff_t * struct canque_ends_t *qends; struct canque_edge_t *qedge; struct canque_slot_t *slot; - int ret = 0; + int ret; unsigned bytes_to_copy; if(!canuser || (canuser->magic != CAN_USER_MAGIC)){ @@ -53,7 +53,8 @@ ssize_t can_write(struct file *file, const char *buffer, size_t length, loff_t * /* Prepare first message */ - copy_from_user(&msg_buff, buffer, sizeof(struct canmsg_t)); + ret = copy_from_user(&msg_buff, buffer, sizeof(struct canmsg_t)); + if(ret) return -EFAULT; /* Automatic selection of extended format if ID>2047 */ if (msg_buff.id & ~0x7ffl & MSG_ID_MASK ) msg_buff.flags |= MSG_EXT; @@ -91,7 +92,8 @@ ssize_t can_write(struct file *file, const char *buffer, size_t length, loff_t * while (bytes_to_copy >= sizeof(struct canmsg_t)) { bytes_to_copy -= sizeof(struct canmsg_t); /* Prepare first message */ - copy_from_user(&msg_buff, buffer, sizeof(struct canmsg_t)); + ret = copy_from_user(&msg_buff, buffer, sizeof(struct canmsg_t)); + if(ret) return -EFAULT; /* Automatic selection of extended format if ID>2047 */ if (msg_buff.id & ~0x7ffl & MSG_ID_MASK ) msg_buff.flags |= MSG_EXT;