linux-kernel - hpet: Convert to unlocked

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LFD.2.00.0910211340540.3526@localhost.localdomain>
Date:	Wed, 21 Oct 2009 13:43:38 +0200 (CEST)
From:	John Kacur <jkacur@...hat.com>
To:	linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>
cc:	Alan Cox <alan@...rguk.ukuu.org.uk>,
	Arnd Bergmann <arndbergmann@...glemail.com>,
	Ingo Molnar <mingo@...e.hu>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Clemens Ladisch <clemens@...isch.de>
Subject: hpet: Convert to unlocked_ioctl


This patch converts the hpet_ioctl to the unlocked version. It is meant to 
be applied after the patch that removed the BKL from the hpet_open 
function.

Note that .llseek is already explicitly set to no_llseek.

>From 84e9964c4c7eeb4e99bb51e3a10768c1f869f259 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@...hat.com>
Date: Wed, 21 Oct 2009 13:34:42 +0200
Subject: [PATCH] hpet: Convert to unlocked_ioctl

The ioctl functions here rely on their own locking using the hpet_lock spinlock.

Signed-off-by: John Kacur <jkacur@...hat.com>
---
 drivers/char/hpet.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 5e83828..e7754cd 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -426,11 +426,9 @@ static int hpet_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
+static long hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
 
-static int
-hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
-	   unsigned long arg)
+static long hpet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	struct hpet_dev *devp;
 
@@ -438,7 +436,7 @@ hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 	return hpet_ioctl_common(devp, cmd, arg, 0);
 }
 
-static int hpet_ioctl_ieon(struct hpet_dev *devp)
+static long hpet_ioctl_ieon(struct hpet_dev *devp)
 {
 	struct hpet_timer __iomem *timer;
 	struct hpet __iomem *hpet;
@@ -545,13 +543,13 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
 	return (unsigned long)m;
 }
 
-static int
+static long
 hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
 {
 	struct hpet_timer __iomem *timer;
 	struct hpet __iomem *hpet;
 	struct hpets *hpetp;
-	int err;
+	long err = 0;
 	unsigned long v;
 
 	switch (cmd) {
@@ -570,8 +568,6 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
 		return -EINVAL;
 	}
 
-	err = 0;
-
 	switch (cmd) {
 	case HPET_IE_OFF:
 		if ((devp->hd_flags & HPET_IE) == 0)
@@ -651,7 +647,7 @@ static const struct file_operations hpet_fops = {
 	.llseek = no_llseek,
 	.read = hpet_read,
 	.poll = hpet_poll,
-	.ioctl = hpet_ioctl,
+	.unlocked_ioctl = hpet_ioctl,
 	.open = hpet_open,
 	.release = hpet_release,
 	.fasync = hpet_fasync,
-- 
1.6.0.6


--
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/