evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: brcm80211: bugfix for fullmac return codes

Browse source 
Some code paths in the fullmac driver did not return a negative value
on error. This has been corrected.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen 2011-05-03 11:35:03 +02:00 • committed by Greg Kroah-Hartman
parent b7ef2a9590
commit 2c09ded576
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file

@ -432,7 +432,7 @@ int dhd_ioctl(dhd_pub_t *dhd_pub, dhd_ioctl_t *ioc, void *buf, uint buflen)
case DHD_GET_VERSION: case DHD_GET_VERSION:
if (buflen < sizeof(int)) if (buflen < sizeof(int))
bcmerror = BCME_BUFTOOSHORT; bcmerror = -BCME_BUFTOOSHORT;
else else
*(int *)buf = DHD_IOCTL_VERSION; *(int *)buf = DHD_IOCTL_VERSION;
break; break;

10
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file

@ -1699,7 +1699,7 @@ static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
/* Copy the ioc control structure part of ioctl request */ /* Copy the ioc control structure part of ioctl request */
if (copy_from_user(&ioc, ifr->ifr_data, sizeof(wl_ioctl_t))) { if (copy_from_user(&ioc, ifr->ifr_data, sizeof(wl_ioctl_t))) {
bcmerror = BCME_BADADDR; bcmerror = -BCME_BADADDR;
goto done; goto done;
} }
@ -1715,11 +1715,11 @@ static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
{ {
buf = kmalloc(buflen, GFP_ATOMIC); buf = kmalloc(buflen, GFP_ATOMIC);
if (!buf) { if (!buf) {
bcmerror = BCME_NOMEM; bcmerror = -BCME_NOMEM;
goto done; goto done;
} }
if (copy_from_user(buf, ioc.buf, buflen)) { if (copy_from_user(buf, ioc.buf, buflen)) {
bcmerror = BCME_BADADDR; bcmerror = -BCME_BADADDR;
goto done; goto done;
} }
} }
@ -1728,12 +1728,12 @@ static int dhd_ioctl_entry(struct net_device *net, struct ifreq *ifr, int cmd)
/* To differentiate between wl and dhd read 4 more byes */ /* To differentiate between wl and dhd read 4 more byes */
if ((copy_from_user(&driver, (char *)ifr->ifr_data + sizeof(wl_ioctl_t), if ((copy_from_user(&driver, (char *)ifr->ifr_data + sizeof(wl_ioctl_t),
sizeof(uint)) != 0)) { sizeof(uint)) != 0)) {
bcmerror = BCME_BADADDR; bcmerror = -BCME_BADADDR;
goto done; goto done;
} }
if (!capable(CAP_NET_ADMIN)) { if (!capable(CAP_NET_ADMIN)) {
bcmerror = BCME_EPERM; bcmerror = -BCME_EPERM;
goto done; goto done;
} }