packages/hackbard/lirc/kernel2.6.14.patch

   1 --- lirc-0.7.2.orig/drivers/lirc_cmdir/lirc_cmdir.c     2005-07-10 10:34:13.000000000 +0200
   2 +++ lirc-0.7.2/drivers/lirc_cmdir/lirc_cmdir.c  2005-09-20 16:32:35.000000000 +0200
   3 @@ -352,7 +352,7 @@
   4         int cmdir_cnt =0;
   5
   6         if(n%sizeof(lirc_t)) return(-EINVAL);
   7 -       retval=verify_area(VERIFY_READ,buf,n);
   8 +       retval=access_ok(VERIFY_READ,buf,n) ? 0 : -EFAULT;
   9         if(retval) return(retval);
  10
  11         count=n/sizeof(lirc_t);
  12 --- lirc-0.7.2.orig/drivers/lirc_it87/lirc_it87.c       2005-06-05 17:43:28.000000000 +0200
  13 +++ lirc-0.7.2/drivers/lirc_it87/lirc_it87.c    2005-09-20 16:35:00.000000000 +0200
  14 @@ -223,8 +223,8 @@
  15                         break;
  16                 }
  17
  18 -               retval=verify_area(VERIFY_WRITE,(void *) buf+n,
  19 -                                  sizeof(lirc_t));
  20 +               retval=access_ok(VERIFY_WRITE,(void *) buf+n,
  21 +                                  sizeof(lirc_t)) ? 0 : -EFAULT;
  22                 if (retval)
  23                 {
  24                         return retval;
  25 @@ -252,7 +252,7 @@
  26
  27          if(n%sizeof(lirc_t) || (n/sizeof(lirc_t)) > WBUF_LEN)
  28                 return(-EINVAL);
  29 -       retval = verify_area(VERIFY_READ, buf, n);
  30 +       retval = access_ok(VERIFY_READ, buf, n) ? 0 : -EFAULT;
  31         if (retval)
  32                 return retval;
  33         copy_from_user(tx_buf, buf, n);
  34 --- lirc-0.7.2.orig/drivers/lirc_parallel/lirc_parallel.c       2005-04-23 13:40:01.000000000 +0200
  35 +++ lirc-0.7.2/drivers/lirc_parallel/lirc_parallel.c    2005-09-20 16:36:12.000000000 +0200
  36 @@ -400,7 +400,7 @@
  37
  38         if(n%sizeof(lirc_t)) return(-EINVAL);
  39
  40 -       result=verify_area(VERIFY_WRITE,buf,n);
  41 +       result=access_ok(VERIFY_WRITE,buf,n) ? 0 : -EFAULT;
  42         if(result) return(result);
  43
  44         add_wait_queue(&lirc_wait,&wait);
  45 @@ -449,7 +449,7 @@
  46                 return(-EBUSY);
  47         }
  48         if(n%sizeof(lirc_t)) return(-EINVAL);
  49 -       result=verify_area(VERIFY_READ,buf,n);
  50 +       result=access_ok(VERIFY_READ,buf,n) ? 0 : -EFAULT
  51         if(result) return(result);
  52
  53         count=n/sizeof(lirc_t);
  54 --- lirc-0.7.2.orig/drivers/lirc_serial/lirc_serial.c   2005-04-23 13:40:01.000000000 +0200
  55 +++ lirc-0.7.2/drivers/lirc_serial/lirc_serial.c        2005-09-20 16:36:41.000000000 +0200
  56 @@ -923,7 +923,7 @@
  57         }
  58
  59         if(n%sizeof(lirc_t)) return(-EINVAL);
  60 -       retval=verify_area(VERIFY_READ,buf,n);
  61 +       retval=access_ok(VERIFY_READ,buf,n) ? 0 : -EFAULT;
  62         if(retval) return(retval);
  63         count=n/sizeof(lirc_t);
  64         if(count>WBUF_LEN || count%2==0) return(-EINVAL);
  65 --- lirc-0.7.2.orig/drivers/lirc_sir/lirc_sir.c 2005-04-23 13:40:01.000000000 +0200
  66 +++ lirc-0.7.2/drivers/lirc_sir/lirc_sir.c      2005-09-20 16:37:21.000000000 +0200
  67 @@ -314,8 +314,8 @@
  68         {
  69                 if(rx_head!=rx_tail)
  70                 {
  71 -                       retval=verify_area(VERIFY_WRITE,
  72 -                                          (void *) buf+n,sizeof(lirc_t));
  73 +                       retval=access_ok(VERIFY_WRITE,
  74 +                                          (void *) buf+n,sizeof(lirc_t)) ? 0 : -EFAULT;
  75                         if (retval)
  76                         {
  77                                 return retval;
  78 @@ -356,7 +356,7 @@
  79
  80          if(n%sizeof(lirc_t) || (n/sizeof(lirc_t)) > WBUF_LEN)
  81                 return(-EINVAL);
  82 -       retval = verify_area(VERIFY_READ, buf, n);
  83 +       retval = access_ok(VERIFY_READ, buf, n) ? 0 : -EFAULT;
  84         if (retval)
  85                 return retval;
  86         copy_from_user(tx_buf, buf, n);