X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/a682f9de48bcce43fba6141fbdb4d451914e0bb4..46e2f34c15f734054295e3a2a2d68828247bcd86:/lincan/src/ioctl.c

diff --git a/lincan/src/ioctl.c b/lincan/src/ioctl.c
index 63aaea1..38d75a4 100644
--- a/lincan/src/ioctl.c
+++ b/lincan/src/ioctl.c
@@ -78,7 +78,9 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 		
 		case CANQUE_FILTER: {
 			struct canfilt_t canfilt;
-			copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+			int ret;
+			ret = copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+			if(ret)	return -EFAULT;
 			if(canuser->rx_edge0){
 				canque_set_filt(canuser->rx_edge0, canfilt.id, canfilt.mask, canfilt.flags);
 			}
@@ -89,10 +91,13 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 			int ret;
 			struct canmsg_t rtr_msg;
 			
-			copy_from_user(&rtr_msg, (void*)arg, sizeof(struct canmsg_t));
+			ret = copy_from_user(&rtr_msg, (void*)arg, sizeof(struct canmsg_t));
+			if(ret)	return -EFAULT;
 			ret = can_ioctl_remote_read(canuser, &rtr_msg, rtr_msg.id, 0);
 			if(ret<0) return ret;
-			copy_to_user((void*)arg, &rtr_msg, sizeof(struct canmsg_t));
+			ret = copy_to_user((void*)arg, &rtr_msg, sizeof(struct canmsg_t));
+			if(ret)	return -EFAULT;
+			break;
 		}
 
 		case CONF_BAUD: {
@@ -109,7 +114,11 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 		
 		case CONF_BAUDPARAMS: {
 			struct can_baudparams_t params;
-			copy_from_user(&params, (void*)arg, sizeof(struct can_baudparams_t));
+			int ret;
+			
+			ret = copy_from_user(&params, (void*)arg, sizeof(struct can_baudparams_t));
+			if(ret)	return -EFAULT;
+
 			if(params.flags == -1) params.flags = 0;
 			if(params.baudrate == -1) params.baudrate = chip->baudrate;
 			if(params.sjw == -1) params.sjw = 0;