2008-12-11 23:02:56

by Hannes Eder

Subject: [PATCH 8/9][v2] mISDN: timerdev: use __user for mISDN_read's buffer argument

Fix this warning:

drivers/isdn/mISDN/timerdev.c:264:11: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
drivers/isdn/mISDN/timerdev.c:264:11: expected int ( *read )( ... )
drivers/isdn/mISDN/timerdev.c:264:11: got int ( static [toplevel] *<noident> )( ... )

Signed-off-by: Hannes Eder <[email protected]>
Acked-by: Karsten Keil <[email protected]>
---
drivers/isdn/mISDN/timerdev.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index 62b5e49..f2b3218 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -86,7 +86,7 @@ mISDN_close(struct inode *ino, struct file *filep)
}

static ssize_t
-mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off)
+mISDN_read(struct file *filep, char __user *buf, size_t count, loff_t *off)
{
struct mISDNtimerdev *dev = filep->private_data;
struct mISDNtimer *timer;
@@ -116,7 +116,7 @@ mISDN_read(struct file *filep, char *buf, size_t count, loff_t *off)
timer = (struct mISDNtimer *)dev->expired.next;
list_del(&timer->list);
spin_unlock_irqrestore(&dev->lock, flags);
- if (put_user(timer->id, (int *)buf))
+ if (put_user(timer->id, (int __user *)buf))
ret = -EFAULT;
else
ret = sizeof(int);
--
1.5.6.3

2008-12-13 05:19:37

by David Miller

Subject: Re: [PATCH 8/9][v2] mISDN: timerdev: use __user for mISDN_read's buffer argument

From: Hannes Eder <[email protected]>
Date: Thu, 11 Dec 2008 22:36:00 +0100

> Fix this warning:
>
> drivers/isdn/mISDN/timerdev.c:264:11: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
> drivers/isdn/mISDN/timerdev.c:264:11: expected int ( *read )( ... )
> drivers/isdn/mISDN/timerdev.c:264:11: got int ( static [toplevel] *<noident> )( ... )
>
> Signed-off-by: Hannes Eder <[email protected]>
> Acked-by: Karsten Keil <[email protected]>

Applied.