[patch] Patch for lirc-0.7.2 to change verify_area to access_ok

lirc-0.7.2-verify-area.patch (text/plain), 3.57 KB, created by Mike Bourgeous on 2005-12-15 13:45:40 UTC

diff -r -U 4 lirc-0.7.2o/drivers/lirc_cmdir/lirc_cmdir.c lirc-0.7.2/drivers/lirc_cmdir/lirc_cmdir.c
--- lirc-0.7.2o/drivers/lirc_cmdir/lirc_cmdir.c	2005-07-10 02:34:13.000000000 -0600
+++ lirc-0.7.2/drivers/lirc_cmdir/lirc_cmdir.c	2005-12-15 19:48:19.000000000 -0700
@@ -351,9 +351,9 @@
 	unsigned int lobyte=0;
 	int cmdir_cnt =0;
 		
 	if(n%sizeof(lirc_t)) return(-EINVAL);
-	retval=verify_area(VERIFY_READ,buf,n);
+	retval=access_ok(VERIFY_READ,buf,n) ? 0 : -EFAULT;
 	if(retval) return(retval);
 	
 	count=n/sizeof(lirc_t);
 	if(count>WBUF_LEN || count%2==0) return(-EINVAL);	
diff -r -U 4 lirc-0.7.2o/drivers/lirc_it87/lirc_it87.c lirc-0.7.2/drivers/lirc_it87/lirc_it87.c
--- lirc-0.7.2o/drivers/lirc_it87/lirc_it87.c	2005-06-05 09:43:28.000000000 -0600
+++ lirc-0.7.2/drivers/lirc_it87/lirc_it87.c	2005-12-15 19:48:01.000000000 -0700
@@ -222,10 +222,10 @@
 		{
 			break;
 		}
 		
-		retval=verify_area(VERIFY_WRITE,(void *) buf+n,
-				   sizeof(lirc_t));
+		retval=access_ok(VERIFY_WRITE,(void *) buf+n,
+				   sizeof(lirc_t)) ? 0 : -EFAULT;
 		if (retval)
 		{
 			return retval;
 		}
@@ -251,9 +251,9 @@
 	int retval;
 
         if(n%sizeof(lirc_t) || (n/sizeof(lirc_t)) > WBUF_LEN)
 		return(-EINVAL);
-	retval = verify_area(VERIFY_READ, buf, n);
+	retval = access_ok(VERIFY_READ, buf, n) ? 0 : -EFAULT;
 	if (retval)
 		return retval;
 	copy_from_user(tx_buf, buf, n);
 	i = 0;
diff -r -U 4 lirc-0.7.2o/drivers/lirc_parallel/lirc_parallel.c lirc-0.7.2/drivers/lirc_parallel/lirc_parallel.c
--- lirc-0.7.2o/drivers/lirc_parallel/lirc_parallel.c	2005-04-23 05:40:01.000000000 -0600
+++ lirc-0.7.2/drivers/lirc_parallel/lirc_parallel.c	2005-12-15 19:47:04.000000000 -0700
@@ -399,9 +399,9 @@
 	DECLARE_WAITQUEUE(wait, current);
 	
 	if(n%sizeof(lirc_t)) return(-EINVAL);
 	
-	result=verify_area(VERIFY_WRITE,buf,n);
+	result=access_ok(VERIFY_WRITE,buf,n) ? 0 : -EFAULT;
 	if(result) return(result);
 	
 	add_wait_queue(&lirc_wait,&wait);
 	set_current_state(TASK_INTERRUPTIBLE);
@@ -448,9 +448,9 @@
 	{
 		return(-EBUSY);
 	}
 	if(n%sizeof(lirc_t)) return(-EINVAL);
-	result=verify_area(VERIFY_READ,buf,n);
+	result=access_ok(VERIFY_READ,buf,n) ? 0 : -EFAULT;
 	if(result) return(result);
 	
 	count=n/sizeof(lirc_t);
 	
diff -r -U 4 lirc-0.7.2o/drivers/lirc_serial/lirc_serial.c lirc-0.7.2/drivers/lirc_serial/lirc_serial.c
--- lirc-0.7.2o/drivers/lirc_serial/lirc_serial.c	2005-04-23 05:40:01.000000000 -0600
+++ lirc-0.7.2/drivers/lirc_serial/lirc_serial.c	2005-12-15 19:24:36.000000000 -0700
@@ -922,9 +922,9 @@
 		return(-EBADF);
 	}
 	
 	if(n%sizeof(lirc_t)) return(-EINVAL);
-	retval=verify_area(VERIFY_READ,buf,n);
+	retval=access_ok(VERIFY_READ,buf,n) ? 0 : -EFAULT;
 	if(retval) return(retval);
 	count=n/sizeof(lirc_t);
 	if(count>WBUF_LEN || count%2==0) return(-EINVAL);
 	copy_from_user(wbuf,buf,n);
diff -r -U 4 lirc-0.7.2o/drivers/lirc_sir/lirc_sir.c lirc-0.7.2/drivers/lirc_sir/lirc_sir.c
--- lirc-0.7.2o/drivers/lirc_sir/lirc_sir.c	2005-04-23 05:40:01.000000000 -0600
+++ lirc-0.7.2/drivers/lirc_sir/lirc_sir.c	2005-12-15 19:47:30.000000000 -0700
@@ -313,10 +313,10 @@
 	while(n<count)
 	{
 		if(rx_head!=rx_tail)
 		{
-			retval=verify_area(VERIFY_WRITE,
-					   (void *) buf+n,sizeof(lirc_t));
+			retval=access_ok(VERIFY_WRITE,
+					   (void *) buf+n,sizeof(lirc_t)) ? 0 : -EFAULT;
 			if (retval)
 			{
 				return retval;
 			}
@@ -355,9 +355,9 @@
 	int retval;
 
         if(n%sizeof(lirc_t) || (n/sizeof(lirc_t)) > WBUF_LEN)
 		return(-EINVAL);
-	retval = verify_area(VERIFY_READ, buf, n);
+	retval = access_ok(VERIFY_READ, buf, n) ? 0 : -EFAULT;
 	if (retval)
 		return retval;
 	copy_from_user(tx_buf, buf, n);
 	i = 0;