mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-10 08:07:05 +00:00
Code Releases Activity

Add explicit memset call to avoid potentially corrupt data

Browse Source
This commit is contained in:
kimocoder 2019-02-15 23:16:15 +01:00
parent a8f972a736
commit ed72c44df7
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_dep/linux/ioctl_cfg80211.c
View File

@ -4118,6 +4118,8 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f
{ {
struct station_info sinfo; struct station_info sinfo;
u8 ie_offset; u8 ie_offset;
_rtw_memset(&sinfo, 0, sizeof(struct station_info));
if (get_frame_sub_type(pmgmt_frame) == WIFI_ASSOCREQ) if (get_frame_sub_type(pmgmt_frame) == WIFI_ASSOCREQ)
ie_offset = _ASOCREQ_IE_OFFSET_; ie_offset = _ASOCREQ_IE_OFFSET_;
else /* WIFI_REASSOCREQ */ else /* WIFI_REASSOCREQ */

6
os_dep/linux/os_intfs.c
View File

@ -81,15 +81,15 @@ MODULE_PARM_DESC(rtw_ips_mode, "The default IPS mode");
module_param(rtw_lps_level, int, 0644); module_param(rtw_lps_level, int, 0644);
MODULE_PARM_DESC(rtw_lps_level, "The default LPS level"); MODULE_PARM_DESC(rtw_lps_level, "The default LPS level");
/* LPS: /* LPS:
* rtw_smart_ps = 0 => TX: pwr bit = 1, RX: PS_Poll * rtw_smart_ps = 0 => TX: pwr bit = 1, RX: PS_Poll
* rtw_smart_ps = 1 => TX: pwr bit = 0, RX: PS_Poll * rtw_smart_ps = 1 => TX: pwr bit = 0, RX: PS_Poll
* rtw_smart_ps = 2 => TX: pwr bit = 0, RX: NullData with pwr bit = 0 * rtw_smart_ps = 2 => TX: pwr bit = 0, RX: NullData with pwr bit = 0
*/ */
int rtw_smart_ps = 2; int rtw_smart_ps = 2;
#ifdef CONFIG_WMMPS_STA #ifdef CONFIG_WMMPS_STA
/* WMMPS: /* WMMPS:
* rtw_smart_ps = 0 => Only for fw test * rtw_smart_ps = 0 => Only for fw test
* rtw_smart_ps = 1 => Refer to Beacon's TIM Bitmap * rtw_smart_ps = 1 => Refer to Beacon's TIM Bitmap
* rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap * rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap

26
os_dep/linux/usb_intf.c
View File

@ -63,12 +63,12 @@ static void rtw_dev_shutdown(struct device *dev)
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
#ifdef CONFIG_GPIO_WAKEUP #ifdef CONFIG_GPIO_WAKEUP
/*default wake up pin change to BT*/ /*default wake up pin change to BT*/
RTW_INFO("%s:default wake up pin change to BT\n", __FUNCTION__); RTW_INFO("%s:default wake up pin change to BT\n", __func__);
rtw_hal_switch_gpio_wl_ctrl(adapter, WAKEUP_GPIO_IDX, _FALSE); rtw_hal_switch_gpio_wl_ctrl(adapter, WAKEUP_GPIO_IDX, _FALSE);
#endif /* CONFIG_GPIO_WAKEUP */ #endif /* CONFIG_GPIO_WAKEUP */
if (pwrctl->wowlan_mode == _TRUE) if (pwrctl->wowlan_mode == _TRUE)
RTW_PRINT("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__); RTW_PRINT("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __func__);
else else
#endif #endif
{ {
@ -824,7 +824,7 @@ static void process_spec_devid(const struct usb_device_id *pdid)
if ((pdid->idVendor == vid) && (pdid->idProduct == pid) && (flags & SPEC_DEV_ID_ASSIGN_IFNAME)) { if ((pdid->idVendor == vid) && (pdid->idProduct == pid) && (flags & SPEC_DEV_ID_ASSIGN_IFNAME)) {
extern char *ifname; extern char *ifname;
strncpy(ifname, "wlan10", 6); strncpy(ifname, "wlan10", 6);
/* RTW_INFO("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __FUNCTION__, __LINE__, ifname, vid, pid); */ /* RTW_INFO("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __func__, __LINE__, ifname, vid, pid); */
} }
#endif /* RTK_DMP_PLATFORM */ #endif /* RTK_DMP_PLATFORM */
@ -899,7 +899,7 @@ int rtw_hw_suspend(_adapter *padapter)
return 0; return 0;
error_exit: error_exit:
RTW_INFO("%s, failed\n", __FUNCTION__); RTW_INFO("%s, failed\n", __func__);
return -1; return -1;
} }
@ -934,7 +934,7 @@ int rtw_hw_resume(_adapter *padapter)
return 0; return 0;
error_exit: error_exit:
RTW_INFO("%s, Open net dev failed\n", __FUNCTION__); RTW_INFO("%s, Open net dev failed\n", __func__);
return -1; return -1;
} }
#endif #endif
@ -954,7 +954,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
padapter = dvobj_get_primary_adapter(dvobj); padapter = dvobj_get_primary_adapter(dvobj);
if (pwrpriv->bInSuspend == _TRUE) { if (pwrpriv->bInSuspend == _TRUE) {
RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend); RTW_INFO("%s bInSuspend = %d\n", __func__, pwrpriv->bInSuspend);
pdbgpriv->dbg_suspend_error_cnt++; pdbgpriv->dbg_suspend_error_cnt++;
goto exit; goto exit;
} }
@ -990,7 +990,7 @@ int rtw_resume_process(_adapter *padapter)
if (pwrpriv->bInSuspend == _FALSE) { if (pwrpriv->bInSuspend == _FALSE) {
pdbgpriv->dbg_resume_error_cnt++; pdbgpriv->dbg_resume_error_cnt++;
RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend); RTW_INFO("%s bInSuspend = %d\n", _func__, pwrpriv->bInSuspend);
return -1; return -1;
} }
@ -1067,13 +1067,13 @@ static int rtw_resume(struct usb_interface *pusb_intf)
padapter = dvobj_get_primary_adapter(dvobj); padapter = dvobj_get_primary_adapter(dvobj);
pmlmeext = &padapter->mlmeextpriv; pmlmeext = &padapter->mlmeextpriv;
RTW_INFO("==> %s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); RTW_INFO("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
pdbgpriv->dbg_resume_cnt++; pdbgpriv->dbg_resume_cnt++;
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
if (pwrpriv->bInternalAutoSuspend) if (pwrpriv->bInternalAutoSuspend)
ret = rtw_resume_process(padapter); ret = rtw_resume_process(padapter);
else else
#endif #endif
{ {
if (pwrpriv->wowlan_mode || pwrpriv->wowlan_ap_mode) { if (pwrpriv->wowlan_mode || pwrpriv->wowlan_ap_mode) {
@ -1097,7 +1097,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
} }
pmlmeext->last_scan_time = rtw_get_current_time(); pmlmeext->last_scan_time = rtw_get_current_time();
RTW_INFO("<======== %s return %d\n", __FUNCTION__, ret); RTW_INFO("<======== %s return %d\n", __func__, ret);
return ret; return ret;
} }
@ -1327,9 +1327,9 @@ _adapter *rtw_usb_primary_adapter_init(struct dvobj_priv *dvobj,
/* usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf ); */ /* init pm_usage_cnt ,let it start from 1 */ /* usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf ); */ /* init pm_usage_cnt ,let it start from 1 */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32))
RTW_INFO("%s...pm_usage_cnt(%d).....\n", __FUNCTION__, atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); RTW_INFO("%s...pm_usage_cnt(%d).....\n", __func__, atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
RTW_INFO("%s...pm_usage_cnt(%d).....\n", __FUNCTION__, dvobj->pusbintf->pm_usage_cnt); RTW_INFO("%s...pm_usage_cnt(%d).....\n", __func__, dvobj->pusbintf->pm_usage_cnt);
#endif #endif
} }
} }
@ -1614,7 +1614,7 @@ static int __init rtw_drv_entry(void)
#endif /* BTCOEXVERSION */ #endif /* BTCOEXVERSION */
if (ret != 0) { if (ret != 0) {
RTW_INFO("%s: power on failed!!(%d)\n", __FUNCTION__, ret); RTW_INFO("%s: power on failed!!(%d)\n", __func__, ret);
ret = -1; ret = -1;
goto exit; goto exit;
} }