From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikanth Karthikesan Date: Wed, 09 Jan 2008 06:12:38 +0000 Subject: [PATCH] Change paride driver to use unlocked_ioctl instead of ioctl Message-Id: <4785B7BC.5040106@suse.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: grant@torque.net, tim@cyberelk.net Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org The ioctl handler is called with the BKL held. Registering unlocked_ioctl handler instead of registering ioctl handler. Signed-off-by: Nikanth Karthikesan --- diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index b91accf..d4fa468 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c @@ -236,7 +236,7 @@ static const struct file_operations pt_fops = { .owner = THIS_MODULE, .read = pt_read, .write = pt_write, - .ioctl = pt_ioctl, + .unlocked_ioctl = pt_ioctl, .open = pt_open, .release = pt_release, }; @@ -685,36 +685,43 @@ out: return err; } -static int pt_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long pt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct pt_unit *tape = file->private_data; struct mtop __user *p = (void __user *)arg; struct mtop mtop; + lock_kernel(); + switch (cmd) { case MTIOCTOP: - if (copy_from_user(&mtop, p, sizeof(struct mtop))) + if (copy_from_user(&mtop, p, sizeof(struct mtop))) { + unlock_kernel(); return -EFAULT; + } switch (mtop.mt_op) { case MTREW: pt_rewind(tape); + unlock_kernel(); return 0; case MTWEOF: pt_write_fm(tape); + unlock_kernel(); return 0; default: printk("%s: Unimplemented mt_op %d\n", tape->name, mtop.mt_op); + unlock_kernel(); return -EINVAL; } default: printk("%s: Unimplemented ioctl 0x%x\n", tape->name, cmd); + unlock_kernel(); return -EINVAL; }