| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20080522213529.1423c01f@core>
Date: Thu, 22 May 2008 21:35:29 +0100
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: linux-kernel@...r.kernel.org, rmk@....linux.org.uk
Subject: [PATCH] ds1620: Push BKL down
Push down the BKL and correct the ioctl return for unknown ioctls.
Signed-off-by: Alan Cox <alan@...hat.com>
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index 334ad5b..6db699d 100644
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -8,10 +8,11 @@
#include <linux/proc_fs.h>
#include <linux/capability.h>
#include <linux/init.h>
+#include <linux/smp_lock.h>
+#include <linux/uaccess.h>
#include <asm/hardware.h>
#include <asm/mach-types.h>
-#include <asm/uaccess.h>
#include <asm/therm.h>
#ifdef CONFIG_PROC_FS
@@ -225,8 +226,8 @@ ds1620_read(struct file *file, char __user *buf, size_t count, loff_t *ptr)
return 1;
}
-static int
-ds1620_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long ds1620_ioctl(struct file *file, unsigned int cmd,
+ unsigned long arg)
{
struct therm therm;
union {
@@ -254,13 +255,16 @@ ds1620_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
therm.lo <<= 1;
therm.hi <<= 1;
-
+ lock_kernel();
ds1620_write_state(&therm);
+ unlock_kernel();
break;
case CMD_GET_THERMOSTATE:
case CMD_GET_THERMOSTATE2:
+ lock_kernel();
ds1620_read_state(&therm);
+ unlock_kernel();
therm.lo >>= 1;
therm.hi >>= 1;
@@ -276,20 +280,25 @@ ds1620_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
case CMD_GET_TEMPERATURE:
case CMD_GET_TEMPERATURE2:
+ lock_kernel();
i = cvt_9_to_int(ds1620_in(THERM_READ_TEMP, 9));
if (cmd == CMD_GET_TEMPERATURE)
i >>= 1;
-
+ unlock_kernel();
return put_user(i, uarg.i) ? -EFAULT : 0;
case CMD_GET_STATUS:
+ lock_kernel();
i = ds1620_in(THERM_READ_CONFIG, 8) & 0xe3;
+ unlock_kernel();
return put_user(i, uarg.i) ? -EFAULT : 0;
case CMD_GET_FAN:
+ lock_kernel();
i = netwinder_get_fan();
+ unnlock_kernel();
return put_user(i, uarg.i) ? -EFAULT : 0;
@@ -299,14 +308,14 @@ ds1620_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
if (get_user(i, uarg.i))
return -EFAULT;
-
+ lock_kernel();
netwinder_set_fan(i);
+ unlock_kernel();
break;
default:
- return -ENOIOCTLCMD;
+ return -ENOTTY;
}
-
return 0;
}
@@ -338,7 +347,7 @@ static const struct file_operations ds1620_fops = {
.owner = THIS_MODULE,
.open = nonseekable_open,
.read = ds1620_read,
- .ioctl = ds1620_ioctl,
+ .unlocked_ioctl = ds1620_ioctl,
};
static struct miscdevice ds1620_miscdev = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists