diff -urNp -x '*.orig' wl-6.30.223.271.org/src/wl/sys/wl_cfg80211_hybrid.c wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c --- wl-6.30.223.271.org/src/wl/sys/wl_cfg80211_hybrid.c 2021-02-25 20:01:39.220996979 +0100 +++ wl-6.30.223.271/src/wl/sys/wl_cfg80211_hybrid.c 2021-02-25 20:01:39.354330631 +0100 @@ -41,6 +41,7 @@ #include #include #include +#include #define EVENT_TYPE(e) dtoh32((e)->event_type) #define EVENT_FLAGS(e) dtoh16((e)->flags) @@ -449,30 +450,8 @@ static void key_endian_to_host(struct wl static s32 wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) { - struct ifreq ifr; - struct wl_ioctl ioc; - mm_segment_t fs; - s32 err = 0; - BUG_ON(len < sizeof(int)); - - memset(&ioc, 0, sizeof(ioc)); - ioc.cmd = cmd; - ioc.buf = arg; - ioc.len = len; - strcpy(ifr.ifr_name, dev->name); - ifr.ifr_data = (caddr_t)&ioc; - - fs = get_fs(); - set_fs(get_ds()); -#if defined(WL_USE_NETDEV_OPS) - err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#else - err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#endif - set_fs(fs); - - return err; + return wlc_ioctl_internal(dev, cmd, arg, len); } static s32 diff -urNp -x '*.orig' wl-6.30.223.271.org/src/wl/sys/wl_iw.c wl-6.30.223.271/src/wl/sys/wl_iw.c --- wl-6.30.223.271.org/src/wl/sys/wl_iw.c 2015-09-19 00:47:15.000000000 +0200 +++ wl-6.30.223.271/src/wl/sys/wl_iw.c 2021-02-25 20:01:39.354330631 +0100 @@ -37,6 +37,7 @@ typedef const struct si_pub si_t; #include #include +#include extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status, uint32 reason, char* stringBuf, uint buflen); @@ -103,29 +104,7 @@ dev_wlc_ioctl( int len ) { - struct ifreq ifr; - wl_ioctl_t ioc; - mm_segment_t fs; - int ret; - - memset(&ioc, 0, sizeof(ioc)); - ioc.cmd = cmd; - ioc.buf = arg; - ioc.len = len; - - strcpy(ifr.ifr_name, dev->name); - ifr.ifr_data = (caddr_t) &ioc; - - fs = get_fs(); - set_fs(get_ds()); -#if defined(WL_USE_NETDEV_OPS) - ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#else - ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE); -#endif - set_fs(fs); - - return ret; + return wlc_ioctl_internal(dev, cmd, arg, len); } static int diff -urNp -x '*.orig' wl-6.30.223.271.org/src/wl/sys/wl_linux.c wl-6.30.223.271/src/wl/sys/wl_linux.c --- wl-6.30.223.271.org/src/wl/sys/wl_linux.c 2021-02-25 20:01:39.220996979 +0100 +++ wl-6.30.223.271/src/wl/sys/wl_linux.c 2021-02-25 20:01:39.354330631 +0100 @@ -1662,10 +1662,7 @@ wl_ioctl(struct net_device *dev, struct goto done2; } - if (segment_eq(get_fs(), KERNEL_DS)) - buf = ioc.buf; - - else if (ioc.buf) { + if (ioc.buf) { if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) { bcmerror = BCME_NORESOURCE; goto done2; @@ -1686,7 +1683,7 @@ wl_ioctl(struct net_device *dev, struct WL_UNLOCK(wl); done1: - if (ioc.buf && (ioc.buf != buf)) { + if (ioc.buf) { if (copy_to_user(ioc.buf, buf, ioc.len)) bcmerror = BCME_BADADDR; MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN)); @@ -1696,6 +1693,39 @@ done2: ASSERT(VALID_BCMERROR(bcmerror)); if (bcmerror != 0) wl->pub->bcmerror = bcmerror; + return (OSL_ERROR(bcmerror)); +} + +int +wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len) +{ + wl_info_t *wl; + wl_if_t *wlif; + int bcmerror; + + if (!dev) + return -ENETDOWN; + + wl = WL_INFO(dev); + wlif = WL_DEV_IF(dev); + if (wlif == NULL || wl == NULL || wl->dev == NULL) + return -ENETDOWN; + + bcmerror = 0; + + WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd)); + + WL_LOCK(wl); + if (!capable(CAP_NET_ADMIN)) { + bcmerror = BCME_EPERM; + } else { + bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif); + } + WL_UNLOCK(wl); + + ASSERT(VALID_BCMERROR(bcmerror)); + if (bcmerror != 0) + wl->pub->bcmerror = bcmerror; return (OSL_ERROR(bcmerror)); } diff -urNp -x '*.orig' wl-6.30.223.271.org/src/wl/sys/wl_linux.h wl-6.30.223.271/src/wl/sys/wl_linux.h --- wl-6.30.223.271.org/src/wl/sys/wl_linux.h 2015-09-19 00:47:15.000000000 +0200 +++ wl-6.30.223.271/src/wl/sys/wl_linux.h 2021-02-25 20:01:39.354330631 +0100 @@ -22,6 +22,7 @@ #define _wl_linux_h_ #include +#include typedef struct wl_timer { struct timer_list timer; @@ -187,6 +188,7 @@ extern irqreturn_t wl_isr(int irq, void extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); extern void wl_free(wl_info_t *wl); extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len); extern struct net_device * wl_netdev_get(wl_info_t *wl); #endif diff -urNp -x '*.orig' wl-6.30.223.271.org/src/wl/sys/wlc_pub.h wl-6.30.223.271/src/wl/sys/wlc_pub.h --- wl-6.30.223.271.org/src/wl/sys/wlc_pub.h 2015-09-19 00:47:15.000000000 +0200 +++ wl-6.30.223.271/src/wl/sys/wlc_pub.h 2021-02-25 20:01:39.354330631 +0100 @@ -24,6 +24,7 @@ #include #include +#include #include "proto/802.11.h" #include "proto/bcmevent.h"