uml: Pushdown the bkl from harddog_kern ioctl (9f37af65) · Commits · 戴 / test

arch/um/drivers/harddog_kern.c

+15 −3

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ static ssize_t harddog_write(struct file file, const char __user data, size_t
		return 0;
		}

		static int harddog_ioctl(struct inode inode, struct file file,
		static int harddog_ioctl_unlocked(struct file *file,
		unsigned int cmd, unsigned long arg)
		{
		void __user argp= (void __user )arg;
		@@ -148,10 +148,22 @@ static int harddog_ioctl(struct inode inode, struct file file,
		}
		}

		static long harddog_ioctl(struct file *file,
		unsigned int cmd, unsigned long arg)
		{
		long ret;

		lock_kernel();
		ret = harddog_ioctl_unlocked(file, cmd, arg);
		unlock_kernel();

		return ret;
		}

		static const struct file_operations harddog_fops = {
		.owner = THIS_MODULE,
		.write = harddog_write,
		.ioctl = harddog_ioctl,
		.unlocked_ioctl = harddog_ioctl,
		.open = harddog_open,
		.release = harddog_release,
		};