Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / drivers / isdn / i4l / isdn_common.c

diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 4910bca52640ed0bf67d9833a9595f23c41f44fa..d6952959d72afc643be51248cadd523e2a0ebcf7 100644 (file)
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1365,7 +1365,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                } else {
                                        s = NULL;
                                }
-                               ret = down_interruptible(&dev->sem);
+                               ret = mutex_lock_interruptible(&dev->mtx);
                                if( ret ) return ret;
                                if ((s = isdn_net_new(s, NULL))) {
                                        if (copy_to_user(argp, s, strlen(s) + 1)){
@@ -1375,7 +1375,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        }
                                } else
                                        ret = -ENODEV;
-                               up(&dev->sem);
+                               mutex_unlock(&dev->mtx);
                                return ret;
                        case IIOCNETASL:
                                /* Add a slave to a network-interface */
@@ -1384,7 +1384,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                                return -EFAULT;
                                } else
                                        return -EINVAL;
-                               ret = down_interruptible(&dev->sem);
+                               ret = mutex_lock_interruptible(&dev->mtx);
                                if( ret ) return ret;
                                if ((s = isdn_net_newslave(bname))) {
                                        if (copy_to_user(argp, s, strlen(s) + 1)){
@@ -1394,17 +1394,17 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        }
                                } else
                                        ret = -ENODEV;
-                               up(&dev->sem);
+                               mutex_unlock(&dev->mtx);
                                return ret;
                        case IIOCNETDIF:
                                /* Delete a network-interface */
                                if (arg) {
                                        if (copy_from_user(name, argp, sizeof(name)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_rm(name);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1433,10 +1433,10 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                if (arg) {
                                        if (copy_from_user(&phone, argp, sizeof(phone)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_addphone(&phone);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1445,10 +1445,10 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                if (arg) {
                                        if (copy_from_user(&phone, argp, sizeof(phone)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_getphones(&phone, argp);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1457,10 +1457,10 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                if (arg) {
                                        if (copy_from_user(&phone, argp, sizeof(phone)))
                                                return -EFAULT;
-                                       ret = down_interruptible(&dev->sem);
+                                       ret = mutex_lock_interruptible(&dev->mtx);
                                        if( ret ) return ret;
                                        ret = isdn_net_delphone(&phone);
-                                       up(&dev->sem);
+                                       mutex_unlock(&dev->mtx);
                                        return ret;
                                } else
                                        return -EINVAL;
@@ -1515,6 +1515,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        if (copy_from_user(&iocts, argp,
                                             sizeof(isdn_ioctl_struct)))
                                                return -EFAULT;
+                                       iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                        if (strlen(iocts.drvid)) {
                                                if ((p = strchr(iocts.drvid, ',')))
                                                        *p = 0;
@@ -1599,6 +1600,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        if (copy_from_user(&iocts, argp,
                                             sizeof(isdn_ioctl_struct)))
                                                return -EFAULT;
+                                       iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                        if (strlen(iocts.drvid)) {
                                                drvidx = -1;
                                                for (i = 0; i < ISDN_MAX_DRIVERS; i++)
@@ -1643,7 +1645,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        } else {
                                                p = (char __user *) iocts.arg;
                                                for (i = 0; i < 10; i++) {
-                                                       sprintf(bname, "%s%s",
+                                                       snprintf(bname, sizeof(bname), "%s%s",
                                                                strlen(dev->drv[drvidx]->msn2eaz[i]) ?
                                                                dev->drv[drvidx]->msn2eaz[i] : "_",
                                                                (i < 9) ? "," : "\0");
@@ -1673,6 +1675,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
                                        char *p;
                                        if (copy_from_user(&iocts, argp, sizeof(isdn_ioctl_struct)))
                                                return -EFAULT;
+                                       iocts.drvid[sizeof(iocts.drvid)-1] = 0;
                                        if (strlen(iocts.drvid)) {
                                                if ((p = strchr(iocts.drvid, ',')))
                                                        *p = 0;
@@ -2304,7 +2307,7 @@ static int __init isdn_init(void)
 #ifdef MODULE
        dev->owner = THIS_MODULE;
 #endif
-       init_MUTEX(&dev->sem);
+       mutex_init(&dev->mtx);
        init_waitqueue_head(&dev->info_waitq);
        for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
                dev->drvmap[i] = -1;