Skip to content

Commit

Permalink
staging: rtlwifi: use siocdevprivate
Browse files Browse the repository at this point in the history
rtl8188eu has an "android private" ioctl command multiplexer
that is not currently safe for use in compat mode because
of its triple-indirect pointer.

rtl8723bs uses a different interface on the SIOCDEVPRIVATE
command, based on the iwpriv data structure

Both also have normal unreachable iwpriv commands, and all
of the above should probably just get removed. For the
moment, just switch over to the new interface.

Cc: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Arnd Bergmann authored and David S. Miller committed Jul 27, 2021
1 parent b9067f5 commit 89939e8
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 10 deletions.
2 changes: 2 additions & 0 deletions drivers/staging/rtl8188eu/include/osdep_intf.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ void rtw_stop_drv_threads(struct adapter *padapter);
void rtw_cancel_all_timer(struct adapter *padapter);

int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
int rtw_android_priv_cmd(struct net_device *dev, struct ifreq *rq,
void __user *data, int cmd);

struct net_device *rtw_init_netdev(void);
u16 rtw_recv_select_queue(struct sk_buff *skb);
Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/rtl8188eu/include/rtw_android.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ enum ANDROID_WIFI_CMD {
ANDROID_WIFI_CMD_MAX
};

int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd);
int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr,
void __user *data, int cmd);

#endif /* __RTW_ANDROID_H__ */
3 changes: 0 additions & 3 deletions drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -2769,9 +2769,6 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ret = rtw_hostapd_ioctl(dev, &wrq->u.data);
break;
#endif /* CONFIG_88EU_AP_MODE */
case (SIOCDEVPRIVATE + 1):
ret = rtw_android_priv_cmd(dev, rq, cmd);
break;
default:
ret = -EOPNOTSUPP;
break;
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/rtl8188eu/os_dep/os_intfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ static const struct net_device_ops rtw_netdev_ops = {
.ndo_set_mac_address = rtw_net_set_mac_address,
.ndo_get_stats = rtw_net_get_stats,
.ndo_do_ioctl = rtw_ioctl,
.ndo_siocdevprivate = rtw_android_priv_cmd,
};

static const struct device_type wlan_type = {
Expand Down
14 changes: 11 additions & 3 deletions drivers/staging/rtl8188eu/os_dep/rtw_android.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
******************************************************************************/

#include <linux/compat.h>
#include <linux/module.h>
#include <linux/netdevice.h>

Expand Down Expand Up @@ -116,17 +117,24 @@ static int android_get_p2p_addr(struct net_device *net, char *command,
return ETH_ALEN;
}

int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr,
void __user *data, int cmd)
{
int ret = 0;
char *command;
int cmd_num;
int bytes_written = 0;
struct android_wifi_priv_cmd priv_cmd;

if (!ifr->ifr_data)
if (cmd != SIOCDEVPRIVATE)
return -EOPNOTSUPP;

if (in_compat_syscall()) /* to be implemented */
return -EOPNOTSUPP;

if (!data)
return -EINVAL;
if (copy_from_user(&priv_cmd, ifr->ifr_data, sizeof(priv_cmd)))
if (copy_from_user(&priv_cmd, data, sizeof(priv_cmd)))
return -EFAULT;
if (priv_cmd.total_len < 1)
return -EINVAL;
Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/rtl8723bs/include/osdep_intf.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ void rtw_stop_drv_threads(struct adapter *padapter);
void rtw_cancel_all_timer(struct adapter *padapter);

int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
int rtw_siocdevprivate(struct net_device *dev, struct ifreq *rq,
void __user *data, int cmd);

int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname);
struct net_device *rtw_init_netdev(struct adapter *padapter);
Expand Down
18 changes: 15 additions & 3 deletions drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -4485,6 +4485,21 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
return err;
}

int rtw_siocdevprivate(struct net_device *dev, struct ifreq *rq,
void __user *data, int cmd)
{
struct iwreq *wrq = (struct iwreq *)rq;

/* little hope of fixing this, better remove the whole function */
if (in_compat_syscall())
return -EOPNOTSUPP;

if (cmd != SIOCDEVPRIVATE)
return -EOPNOTSUPP;

return rtw_ioctl_wext_private(dev, &wrq->u);
}

int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
struct iwreq *wrq = (struct iwreq *)rq;
Expand All @@ -4497,9 +4512,6 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
case RTL_IOCTL_HOSTAPD:
ret = rtw_hostapd_ioctl(dev, &wrq->u.data);
break;
case SIOCDEVPRIVATE:
ret = rtw_ioctl_wext_private(dev, &wrq->u);
break;
default:
ret = -EOPNOTSUPP;
break;
Expand Down
1 change: 1 addition & 0 deletions drivers/staging/rtl8723bs/os_dep/os_intfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ static const struct net_device_ops rtw_netdev_ops = {
.ndo_set_mac_address = rtw_net_set_mac_address,
.ndo_get_stats = rtw_net_get_stats,
.ndo_do_ioctl = rtw_ioctl,
.ndo_siocdevprivate = rtw_siocdevprivate,
};

int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
Expand Down

0 comments on commit 89939e8

Please sign in to comment.