[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20190106162101.9176-1-pakki001@umn.edu>
Date: Sun, 6 Jan 2019 10:20:59 -0600
From: Aditya Pakki <pakki001@....edu>
To: pakki001@....edu
Cc: kjlu@....edu, Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Quytelda Kahja <quytelda@...alin.org>,
Michael Straube <straube.linux@...il.com>,
Mamta Shukla <mamtashukla555@...il.com>,
Nathan Chancellor <natechancellor@...il.com>,
Wen Yang <wen.yang99@....com.cn>,
Colin Ian King <colin.king@...onical.com>,
Arushi Singhal <arushisinghal19971997@...il.com>,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Subject: [PATCH] v2 staging: rtl8723bs: Clean up dead code
rtw_wps_start() is part of dead code due to CONFIG_INTEL_WIDI.
The fix removes the deadcode and replaces the function with NULL
in rtw_private_handler. Identified as part of copy_from_user bug.
Signed-off-by: Aditya Pakki <pakki001@....edu>
---
.../staging/rtl8723bs/os_dep/ioctl_linux.c | 34 +------------------
1 file changed, 1 insertion(+), 33 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 8fb03efd588b..2621c47f343f 100644
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -2568,38 +2568,6 @@ static int rtw_set_pid(struct net_device *dev,
}
-static int rtw_wps_start(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra)
-{
-
- int ret = 0;
- struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
- struct iw_point *pdata = &wrqu->data;
- u32 u32wps_start = 0;
- unsigned int uintRet = 0;
-
- if ((true == padapter->bDriverStopped) ||(true ==padapter->bSurpriseRemoved) || (NULL == pdata)) {
- ret = -EINVAL;
- goto exit;
- }
-
- uintRet = copy_from_user((void*)&u32wps_start, pdata->pointer, 4);
- if (u32wps_start == 0)
- u32wps_start = *extra;
-
- DBG_871X("[%s] wps_start = %d\n", __func__, u32wps_start);
-
-#ifdef CONFIG_INTEL_WIDI
- process_intel_widi_wps_status(padapter, u32wps_start);
-#endif /* CONFIG_INTEL_WIDI */
-
-exit:
-
- return ret;
-
-}
-
static int rtw_p2p_set(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@@ -4820,7 +4788,7 @@ static iw_handler rtw_private_handler[] = {
rtw_get_ap_info, /* 0x04 */
rtw_set_pid, /* 0x05 */
- rtw_wps_start, /* 0x06 */
+ NULL, /* 0x06 */
/* for PLATFORM_MT53XX */
rtw_wx_get_sensitivity, /* 0x07 */
--
2.17.1
Powered by blists - more mailing lists