X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/fb2dd0f20bd6264291dccb5e97609a23cae2fd1a..342df29e2031e12a3e928420873cbebeb85d645a:/lincan/src/write.c

diff --git a/lincan/src/write.c b/lincan/src/write.c
index 1760bc2..4b65a14 100644
--- a/lincan/src/write.c
+++ b/lincan/src/write.c
@@ -4,12 +4,13 @@
  * Rewritten for new CAN queues by Pavel Pisa - OCERA team member
  * email:pisa@cmp.felk.cvut.cz
  * This software is released under the GPL-License.
- * Version lincan-0.2  9 Jul 2003
+ * Version lincan-0.3  17 Jun 2004
  */
 
 #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,9 +53,12 @@ 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));
-	/* Automatic selection of extended format if "extended" set and ID>2047 */
-	if (extended) if (msg_buff.id & ~0x7ffl ) msg_buff.flags |= MSG_EXT;
+	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;
+	/* has been dependent on "extended" option */
 
 	/* If the output buffer is full, return immediately in case O_NONBLOCK
 	 * has been specified or loop until space becomes available.
@@ -88,9 +92,13 @@ 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));
-		/* Automatic selection of extended format if "extended" set and ID>2047 */
-		if (extended) if (msg_buff.id & ~0x7ffl ) msg_buff.flags |= MSG_EXT;
+		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;
+		/* has been dependent on "extended" option */
+
 		/* Get slot */
 		if(canque_get_inslot4id(qends, &qedge, &slot, 
 			0, msg_buff.id, 0) < 0) break;