[patch] locking patch to 1.2.1

vhba-1.2.1-kernel-2.6.36.patch (text/plain), 1.37 KB, created by Rafał Mużyło on 2011-01-06 00:46:14 UTC

--- vhba.c.old	2010-11-24 16:10:59.000000000 +0100
+++ vhba.c	2010-11-24 16:43:30.888675002 +0100
@@ -672,12 +672,13 @@
         return ret;
 }
 
-static int vhba_ctl_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long vhba_ctl_ioctl (struct file *file, unsigned int cmd, unsigned long arg)
 {
         struct vhba_device *vdev = file->private_data;
         struct vhba_host *vhost;
         struct scsi_device *sdev;
 
+        lock_kernel();
         switch (cmd) {
         case 0xBEEF001:
                 vhost = platform_get_drvdata(&vhba_platform_device);
@@ -694,13 +695,16 @@
                         scsi_device_put(sdev);
 
                         if (copy_to_user((void *)arg, id, sizeof(id)))
-                                return -EFAULT;
+                                { unlock_kernel(); return -EFAULT; }
         
+                        unlock_kernel();
                         return 0;
                 } else {
+                        unlock_kernel();
                         return -ENODEV;
                 }
         }
+        unlock_kernel();
     
         return -ENOTTY;
 }
@@ -782,7 +786,7 @@
         .read = vhba_ctl_read,
         .write = vhba_ctl_write,
         .poll = vhba_ctl_poll,
-        .ioctl = vhba_ctl_ioctl,
+        .unlocked_ioctl = vhba_ctl_ioctl,
 };
 
 static struct miscdevice vhba_miscdev = {