X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a4c9ead4b64bd4de307f375c2ff313a7a07a06e0..1d20caee804d28a792dcacbf8424dc23b80c6370:/lincan/src/write.c

diff --git a/lincan/src/write.c b/lincan/src/write.c
index 6ef80ee..4b65a14 100644
--- a/lincan/src/write.c
+++ b/lincan/src/write.c
@@ -10,6 +10,7 @@
 #include "../include/can.h"
 #include "../include/can_sysdep.h"
 #include "../include/main.h"
+#include "../include/write.h"
 
 ssize_t can_write(struct file *file, const char *buffer, size_t length, loff_t *offset)
 {
@@ -19,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)){
@@ -52,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;
@@ -90,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;