| 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
| ||
|
Date: Thu, 22 May 2008 22:20:12 +0100
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: linux-kernel@...r.kernel.org, sfr@....ibm.com
Subject: [PATCH] viotape: Push down BKL ioctls
Signed-off-by: Alan Cox <alan@...hat.com>
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 58aad63..b75f79f 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -46,8 +46,9 @@
#include <linux/completion.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+#include <linux/smp_lock.h>
+#include <linux/uaccess.h>
-#include <asm/uaccess.h>
#include <asm/ioctls.h>
#include <asm/firmware.h>
#include <asm/vio.h>
@@ -509,18 +510,24 @@ free_op:
}
/* ioctl */
-static int viotap_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long viotap_ioctl(struct file *file, unsigned int cmd,
+ unsigned long arg)
{
HvLpEvent_Rc hvrc;
int ret;
struct viot_devinfo_struct devi;
struct mtop mtc;
u32 myOp;
- struct op_struct *op = get_op_struct();
+ struct op_struct *op;
- if (op == NULL)
+ lock_kernel();
+
+ op= get_op_struct();
+
+ if (op == NULL) {
+ unlock_kernel();
return -ENOMEM;
+ }
get_dev_info(file->f_path.dentry->d_inode, &devi);
@@ -661,6 +668,7 @@ static int viotap_ioctl(struct inode *inode, struct file *file,
&viomtget[devi.devno],
sizeof(viomtget[0])))
ret = -EFAULT;
+ unlock_kernel();
return ret;
case MTIOCPOS:
printk(VIOTAPE_KERN_WARN "Got an (unsupported) MTIOCPOS\n");
@@ -674,6 +682,7 @@ static int viotap_ioctl(struct inode *inode, struct file *file,
free_op:
free_op_struct(op);
up(&reqSem);
+ unlock_kernel();
return ret;
}
@@ -783,12 +792,12 @@ free_op:
}
const struct file_operations viotap_fops = {
- .owner = THIS_MODULE,
- .read = viotap_read,
- .write = viotap_write,
- .ioctl = viotap_ioctl,
- .open = viotap_open,
- .release = viotap_release,
+ .owner = THIS_MODULE,
+ .read = viotap_read,
+ .write = viotap_write,
+ .unlocked_ioctl = viotap_ioctl,
+ .open = viotap_open,
+ .release = viotap_release,
};
/* Handle interrupt events for tape */
@@ -1000,8 +1009,7 @@ static int chg_state(int index, unsigned char new_state, struct file *file)
if (*cur_state == VIOT_WRITING) {
struct mtop write_eof = { MTWEOF, 1 };
- rc = viotap_ioctl(NULL, file, MTIOCTOP,
- (unsigned long)&write_eof);
+ rc = viotap_ioctl(file, MTIOCTOP, (unsigned long)&write_eof);
}
*cur_state = new_state;
return rc;
--
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