Skip to contentSkip to conversation

sa1100_wdt.c sparse cleanups

WATCHDOG Ian Campbell 5 participants 7 messages Nov 2, 2005 – Jan 18, 2006 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean.

drivers/char/watchdog/sa1100_wdt.c +6 -6
Index: 2.6/drivers/char/watchdog/sa1100_wdt.c
===================================================================
@@ -74,7 +74,7 @@
 	return 0;
 }
 
-static ssize_t sa1100dog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
+static ssize_t sa1100dog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
 {
 	if (len)
 		/* Refresh OSMR3 timer. */
@@ -96,20 +96,20 @@
 
 	switch (cmd) {
 	case WDIOC_GETSUPPORT:
-		ret = copy_to_user((struct watchdog_info *)arg, &ident,
+		ret = copy_to_user((struct watchdog_info __user *)arg, &ident,
 				   sizeof(ident)) ? -EFAULT : 0;
 		break;
 
 	case WDIOC_GETSTATUS:
-		ret = put_user(0, (int *)arg);
+		ret = put_user(0, (int __user *)arg);
 		break;
 
 	case WDIOC_GETBOOTSTATUS:
-		ret = put_user(boot_status, (int *)arg);
+		ret = put_user(boot_status, (int __user *)arg);
 		break;
 
 	case WDIOC_SETTIMEOUT:
-		ret = get_user(time, (int *)arg);
+		ret = get_user(time, (int __user *)arg);
 		if (ret)
 			break;
 
@@ -123,7 +123,7 @@
 		/*fall through*/
 
 	case WDIOC_GETTIMEOUT:
-		ret = put_user(pre_margin / OSCR_FREQ, (int *)arg);
+		ret = put_user(pre_margin / OSCR_FREQ, (int __user *)arg);
 		break;
 
 	case WDIOC_KEEPALIVE:
Signature · 10 lines
Ian Campbell, Senior Design Engineer
                                        Web: http://www.arcom.com
Arcom, Clifton Road, 			Direct: +44 (0)1223 403 465
Cambridge CB1 7EA, United Kingdom	Phone:  +44 (0)1223 411 200


_____________________________________________________________________
The message in this transmission is sent in confidence for the attention of the addressee only and should not be disclosed to any other party. Unauthorised recipients are requested to preserve this confidentiality. Please advise the sender if the addressee is not resident at the receiving end.  Email to and from Arcom is automatically monitored for operational and lawful business reasons.

This message has been virus scanned by MessageLabs.
#1 lore raw

drivers/char/watchdog/sa1100_wdt.c line 100

Quoted 7 lines · Ian Campbell
drivers/char/watchdog/sa1100_wdt.c +1 -1
@@ -96,20 +96,20 @@
 
 	switch (cmd) {
 	case WDIOC_GETSUPPORT:
-		ret = copy_to_user((struct watchdog_info *)arg, &ident,
+		ret = copy_to_user((struct watchdog_info __user *)arg, &ident,
 				   sizeof(ident)) ? -EFAULT : 0;

It's probably better to use a union with these, eg:

	union {
		void __user *arg;
		struct watchdog_info __user *info;
		int __user *i;
	} u;

	u.arg = (void __user *)arg;

...

	ret = copy_to_user(u.info, &ident, sizeof(ident)) ? -EFAULT : 0;

etc

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core
#2 lore raw
Quoted 10 lines · Russell King

It's probably better to use a union with these, eg:

	union {
		void __user *arg;
		struct watchdog_info __user *info;
		int __user *i;
	} u;

	u.arg = (void __user *)arg;
Quoted 3 lines

...

	ret = copy_to_user(u.info, &ident, sizeof(ident)) ? -EFAULT : 0;

Just use void __user *.

#3 lore raw
Quoted 9 lines · Al Viro
Quoted 8 lines · Russell King

It's probably better to use a union with these, eg:

	union {
		void __user *arg;
		struct watchdog_info __user *info;
		int __user *i;
	} u;
Quoted 7 lines
Quoted 5 lines
	u.arg = (void __user *)arg;

...

	ret = copy_to_user(u.info, &ident, sizeof(ident)) ? -EFAULT : 0;

Just use void __user *.

That works for copy_to_user, but not for put_user() where the type of the pointer matters.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core
#4 lore raw
In reply to Russell King
Quoted 1 line · Russell King

It's probably better to use a union with these, eg:

The common idiom in the watchdog drivers seems to be to use separate variables. I'll leave it up to Wim if he wants to change that.

The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean.

drivers/char/watchdog/sa1100_wdt.c +8 -7
Index: 2.6/drivers/char/watchdog/sa1100_wdt.c
===================================================================
@@ -74,7 +74,7 @@
 	return 0;
 }
 
-static ssize_t sa1100dog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
+static ssize_t sa1100dog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
 {
 	if (len)
 		/* Refresh OSMR3 timer. */
@@ -93,23 +93,24 @@
 {
 	int ret = -ENOIOCTLCMD;
 	int time;
+	void __user *argp = (void __user *)arg;
+	int __user *p = argp;
 
 	switch (cmd) {
 	case WDIOC_GETSUPPORT:
-		ret = copy_to_user((struct watchdog_info *)arg, &ident,
-				   sizeof(ident)) ? -EFAULT : 0;
+		ret = copy_to_user(argp, &ident, sizeof(ident)) ? -EFAULT : 0;
 		break;
 
 	case WDIOC_GETSTATUS:
-		ret = put_user(0, (int *)arg);
+		ret = put_user(0, p);
 		break;
 
 	case WDIOC_GETBOOTSTATUS:
-		ret = put_user(boot_status, (int *)arg);
+		ret = put_user(boot_status, p);
 		break;
 
 	case WDIOC_SETTIMEOUT:
-		ret = get_user(time, (int *)arg);
+		ret = get_user(time, p);
 		if (ret)
 			break;
 
@@ -123,7 +124,7 @@
 		/*fall through*/
 
 	case WDIOC_GETTIMEOUT:
-		ret = put_user(pre_margin / OSCR_FREQ, (int *)arg);
+		ret = put_user(pre_margin / OSCR_FREQ, p);
 		break;
 
 	case WDIOC_KEEPALIVE:
Signature · 10 lines
Ian Campbell, Senior Design Engineer
                                        Web: http://www.arcom.com
Arcom, Clifton Road, 			Direct: +44 (0)1223 403 465
Cambridge CB1 7EA, United Kingdom	Phone:  +44 (0)1223 411 200


_____________________________________________________________________
The message in this transmission is sent in confidence for the attention of the addressee only and should not be disclosed to any other party. Unauthorised recipients are requested to preserve this confidentiality. Please advise the sender if the addressee is not resident at the receiving end.  Email to and from Arcom is automatically monitored for operational and lawful business reasons.

This message has been virus scanned by MessageLabs.
#5 lore raw

Hi Ian,

Quoted 10 lines · Russell King
Quoted 2 lines

It's probably better to use a union with these, eg:

The common idiom in the watchdog drivers seems to be to use separate variables. I'll leave it up to Wim if he wants to change that.

The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean.

I seem to have missed this last e-mail (I was moving around that time...). This is indeed how it's been done in other drivers. I just uploaded this "patch" into my -mm test tree. Within a week or two I'll move it to the final watchdog tree.

We should look to the struct watchdog part in more detail though. a union is an option, but probably not the only one :-)

Greetings,
Wim.

#6 lore raw
Quoted 11 lines · Wim Van Sebroeck

Hi Ian,

Quoted 9 lines · Russell King
Quoted 2 lines

It's probably better to use a union with these, eg:

The common idiom in the watchdog drivers seems to be to use separate variables. I'll leave it up to Wim if he wants to change that.

The following makes drivers/char/watchdog/sa1100_wdt.c sparse clean.

Quoted 8 lines
Quoted 1 line

I seem to have missed this last e-mail (I was moving around that time...). This is indeed how it's been done in other drivers. I just uploaded this "patch" into my -mm test tree. Within a week or two I'll move it to the final watchdog tree.

We should look to the struct watchdog part in more detail though. a union is an option, but probably not the only one :-)

Hi Wim,

Thanks for applying the patch.

BTW I've changed jobs since I sent it and I'm no longer working with ARM hardware.

Ian.

Signature · 5 lines
Ian Campbell

Q:	Why do the police always travel in threes?
A:	One to do the reading, one to do the writing, and the other keeps
	an eye on the two intellectuals.