2021-05-01 11:53:08

by Ashish Kalra

Subject: [PATCH v2] staging: wlan-ng: silence incorrect type in argument 1 (different address spaces)

Currently p80211knetdev_do_ioctl use type casting to req->data to prevent sparse warning while calling memdup_user, instead of type casting it here, its better to change data type for data inside p80211ioctl_req to include __user.

Signed-off-by: Ashish Kalra <[email protected]>
---

Changes from v1:
removed type casting of (void __user *) for req->data and corrected type for data to include __user.

drivers/staging/wlan-ng/p80211ioctl.h | 2 +-
drivers/staging/wlan-ng/p80211netdev.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h
index ed65ac57adbe..77e8d2913b76 100644
--- a/drivers/staging/wlan-ng/p80211ioctl.h
+++ b/drivers/staging/wlan-ng/p80211ioctl.h
@@ -81,7 +81,7 @@

struct p80211ioctl_req {
char name[WLAN_DEVNAMELEN_MAX];
- caddr_t data;
+ char __user *data;
u32 magic;
u16 len;
u32 result;
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index 70570e8a5ad2..dfb2d2832830 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -569,7 +569,7 @@ static int p80211knetdev_do_ioctl(struct net_device *dev,
goto bail;
}

- msgbuf = memdup_user((void __user *)req->data, req->len);
+ msgbuf = memdup_user(req->data, req->len);
if (IS_ERR(msgbuf)) {
result = PTR_ERR(msgbuf);
goto bail;
@@ -579,7 +579,7 @@ static int p80211knetdev_do_ioctl(struct net_device *dev,

if (result == 0) {
if (copy_to_user
- ((void __user *)req->data, msgbuf, req->len)) {
+ (req->data, msgbuf, req->len)) {
result = -EFAULT;
}
}
--
2.30.2

2021-05-01 12:24:04

by Greg Kroah-Hartman

Subject: Re: [PATCH v2] staging: wlan-ng: silence incorrect type in argument 1 (different address spaces)

On Sat, May 01, 2021 at 05:09:28PM +0530, Ashish Kalra wrote:
> Currently p80211knetdev_do_ioctl use type casting to req->data to prevent sparse warning while calling memdup_user, instead of type casting it here, its better to change data type for data inside p80211ioctl_req to include __user.

Please properly line-wrap your changelog comments.

Can you fix it up and resend it as v3?

thanks,

greg k-h

2021-05-01 13:56:49

by Ashish Kalra

Subject: Re: [PATCH v2] staging: wlan-ng: silence incorrect type in argument 1 (different address spaces)

On Sat, May 01, 2021 at 02:23:12PM +0200, Greg Kroah-Hartman wrote:
> On Sat, May 01, 2021 at 05:09:28PM +0530, Ashish Kalra wrote:
> > Currently p80211knetdev_do_ioctl use type casting to req->data to prevent sparse warning while calling memdup_user, instead of type casting it here, its better to change data type for data inside p80211ioctl_req to include __user.
>
> Please properly line-wrap your changelog comments.
>
> Can you fix it up and resend it as v3?
>
> thanks,
>
> greg k-h
Thanks Greg for your feedback
Kindly ignore v3 and review v4, i have modified it as pe your feedback