Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8155f368 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: use address space qualifier in brcmfmac 



Several sparse warning were issued due to missing __user qualifier
for brcmfmac variables. This patch adds those.

Reported-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7e9f621c

drivers/staging/brcm80211/brcmfmac/dhd.h

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ extern void brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, 
/* Linux network driver ioctl encoding */

struct brcmf_c_ioctl {

	uint cmd;		/* common ioctl definition */

	void *buf;		/* pointer to user buffer */

	void __user *buf;	/* pointer to user buffer */

	uint len;		/* length of user buffer */

	bool set;		/* get or set request (optional) */

	uint used;		/* bytes read or written (optional) */

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static struct ethtool_ops brcmf_ethtool_ops = { 
	.get_drvinfo = brcmf_ethtool_get_drvinfo

};



static int brcmf_ethtool(struct brcmf_info *drvr_priv, void *uaddr)

static int brcmf_ethtool(struct brcmf_info *drvr_priv, void __user *uaddr)

{

	struct ethtool_drvinfo info;

	char drvname[sizeof(info.driver)];
@@ -1001,7 +1001,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *net, struct ifreq *ifr, 
	}



	/* To differentiate read 4 more byes */

	if ((copy_from_user(&driver, (char *)ifr->ifr_data +

	if ((copy_from_user(&driver, (char __user *)ifr->ifr_data +

			    sizeof(struct brcmf_ioctl), sizeof(uint)) != 0)) {

		bcmerror = -EINVAL;

		goto done;

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ brcmf_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) 
	ioc.buf = arg;

	ioc.len = len;

	strcpy(ifr.ifr_name, dev->name);

	ifr.ifr_data = (caddr_t)&ioc;

	ifr.ifr_data = (char __user *)&ioc;



	fs = get_fs();

	set_fs(get_ds());