staging: rtl8712: make unsigned length for rtl8717_get{_wpa_,_wpa2_,_}ie
PATCH 1/2 staging: rtl8712: make unsigned length for rtl8717_get{_wpa_,_wpa2_,_}ie
Fixed r8712_get_ie, r8712_get_wpa_ie, r8712_get_wpa2_ie to have a length as unsigned int pointer instead of signed.
Sparse warnings:
drivers/staging/rtl8712/rtl871x_ioctl_linux.c:173:27: warning: incorrect type in argument 3 (different signedness)drivers/staging/rtl8712/rtl871x_ioctl_linux.c:173:27: expected signed int *lendrivers/staging/rtl8712/rtl871x_ioctl_linux.c:173:27: got unsigned int *<noident>drivers/staging/rtl8712/rtl871x_ioctl_linux.c:613:35: warning: incorrect type in argument 3 (different signedness)drivers/staging/rtl8712/rtl871x_ioctl_linux.c:613:35: expected signed int *lendrivers/staging/rtl8712/rtl871x_ioctl_linux.c:613:35: got unsigned int *<noident>drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1411:67: warning: incorrect type in argument 3 (different signedness)drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1411:67: expected signed int *lendrivers/staging/rtl8712/rtl871x_ioctl_linux.c:1411:67: got unsigned int *<noident>drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1992:33: warning: incorrect type in argument 2 (different signedness)drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1992:33: expected int *rsn_ie_lendrivers/staging/rtl8712/rtl871x_ioctl_linux.c:1992:33: got unsigned int *<noident>drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1998:33: warning: incorrect type in argument 2 (different signedness)drivers/staging/rtl8712/rtl871x_ioctl_linux.c:1998:33: expected int *rsn_ie_lendrivers/staging/rtl8712/rtl871x_ioctl_linux.c:1998:33: got unsigned int *<noident>drivers/staging/rtl8712/rtl871x_mlme.c:1701:59: warning: incorrect type in argument 3 (different signedness)drivers/staging/rtl8712/rtl871x_mlme.c:1701:59: expected signed int *lendrivers/staging/rtl8712/rtl871x_mlme.c:1701:59: got unsigned int *<noident>
--- drivers/staging/rtl8712/ieee80211.c | 8 ++++---- drivers/staging/rtl8712/ieee80211.h | 6 +++--- drivers/staging/rtl8712/rtl871x_mlme.c | 3 ++- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-)
drivers/staging/rtl8712/ieee80211.c +4 -4
@@ -107,7 +107,7 @@ u8 *r8712_set_ie(u8 *pbuf, sint index, uint len, u8 *source, uint *frlen)* index: the information element id index, limit is the limit for search * --------------------------------------------------------------------------- */ -u8 *r8712_get_ie (u8 *pbuf,sint index,sint *len,sint limit) +u8 *r8712_get_ie (u8 *pbuf,sint index,uint *len,sint limit) {sint tmp, i;u8 *p;
@@ -210,9 +210,9 @@ int r8712_generate_ie(struct registry_priv *pregistrypriv)return sz; } -unsigned char *r8712_get_wpa_ie (unsigned char *pie,int *wpa_ie_len,int limit) +unsigned char *r8712_get_wpa_ie (unsigned char *pie,uint *wpa_ie_len,int limit) { -int len; +u32 len;u16 val16;unsigned char wpa_oui_type[] = {0x00 ,0x50 ,0xf2 ,0x01 };u8 *pbuf = pie;
@@ -243,7 +243,7 @@ unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)return NULL ; } -unsigned char *r8712_get_wpa2_ie (unsigned char *pie,int *rsn_ie_len,int limit) +unsigned char *r8712_get_wpa2_ie (unsigned char *pie,uint *rsn_ie_len,int limit) {return r8712_get_ie (pie, _WPA2_IE_ID_, rsn_ie_len, limit); }
drivers/staging/rtl8712/ieee80211.h +3 -3
@@ -738,9 +738,9 @@ static inline int ieee80211_get_hdrlen(u16 fc)struct registry_priv ;u8 *r8712_set_ie (u8 *pbuf,sint index,uint len,u8 *source,uint *frlen); -u8 *r8712_get_ie (u8 *pbuf,sint index,sint *len,sint limit); -unsigned char *r8712_get_wpa_ie (unsigned char *pie,int *rsn_ie_len,int limit); -unsigned char *r8712_get_wpa2_ie (unsigned char *pie,int *rsn_ie_len, +u8 *r8712_get_ie (u8 *pbuf,sint index,uint *len,sint limit); +unsigned char *r8712_get_wpa_ie (unsigned char *pie,uint *rsn_ie_len,int limit); +unsigned char *r8712_get_wpa2_ie (unsigned char *pie,uint *rsn_ie_len,int limit);int r8712_parse_wpa_ie (u8 *wpa_ie,int wpa_ie_len,int *group_cipher,int *pairwise_cipher);
drivers/staging/rtl8712/rtl871x_mlme.c +2 -1
@@ -1728,7 +1728,8 @@ unsigned int r8712_restructure_ht_ie(struct _adapter *padapter, u8 *in_ie,static void update_ht_cap (struct _adapter *padapter,u8 *pie,uint ie_len) {u8 *p, max_ampdu_sz; -int i, len; +int i; +uint len;struct sta_info *bmc_sta, *psta;struct ieee80211_ht_cap *pht_capie;struct recv_reorder_ctrl *preorder_ctrl;
drivers/staging/rtl8712/rtl871x_xmit.c +1 -1
@@ -717,7 +717,7 @@ void r8712_update_protection(struct _adapter *padapter, u8 *ie, uint ie_len) {uint protection;u8 *perp; -sint erp_len; +uint erp_len;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct registry_priv *pregistrypriv = &padapter->registrypriv;
Signature · 1 line
2.14.3
PATCH 2/2 staging: rtl8712: fix signedness of length to rtl8717_set_ie
rtl8717_set_it() takes an unsigned int pointer as length, fixed signedness in code using it.
Sparse warnings:
drivers/staging/rtl8712/ieee80211.c:191:53: warning: incorrect type in argument 5 (different signedness)drivers/staging/rtl8712/ieee80211.c:191:53: expected unsigned int [usertype] *frlendrivers/staging/rtl8712/ieee80211.c:191:53: got int *<noident>drivers/staging/rtl8712/ieee80211.c:197:57: warning: incorrect type in argument 5 (different signedness)drivers/staging/rtl8712/ieee80211.c:197:57: expected unsigned int [usertype] *frlendrivers/staging/rtl8712/ieee80211.c:197:57: got int *<noident>drivers/staging/rtl8712/ieee80211.c:199:63: warning: incorrect type in argument 5 (different signedness)drivers/staging/rtl8712/ieee80211.c:199:63: expected unsigned int [usertype] *frlendrivers/staging/rtl8712/ieee80211.c:199:63: got int *<noident>drivers/staging/rtl8712/ieee80211.c:202:67: warning: incorrect type in argument 5 (different signedness)drivers/staging/rtl8712/ieee80211.c:202:67: expected unsigned int [usertype] *frlendrivers/staging/rtl8712/ieee80211.c:202:67: got int *<noident>drivers/staging/rtl8712/ieee80211.c:206:73: warning: incorrect type in argument 5 (different signedness)drivers/staging/rtl8712/ieee80211.c:206:73: expected unsigned int [usertype] *frlendrivers/staging/rtl8712/ieee80211.c:206:73: got int *<noident>drivers/staging/rtl8712/ieee80211.c:209:75: warning: incorrect type in argument 5 (different signedness)drivers/staging/rtl8712/ieee80211.c:209:75: expected unsigned int [usertype] *frlendrivers/staging/rtl8712/ieee80211.c:209:75: got int *<noident>
--- drivers/staging/rtl8712/ieee80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/rtl8712/ieee80211.c +2 -1
@@ -166,7 +166,8 @@ static uint r8712_get_rateset_len(u8 *rateset)int r8712_generate_ie (struct registry_priv *pregistrypriv) { -int sz =0 , rate_len; +int rate_len; +uint sz =0 ;struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;u8 *ie = pdev_network->IEs;
Signature · 1 line
2.14.3
Greg KH
maintainerQuoted 2 lines · Stefano Manni
Fixed
r8712_get_ie,r8712_get_wpa_ie,r8712_get_wpa2_ieto have a length as unsigned int pointer instead of signed.
<snip>
Can you rebase both of these patches on the staging-testing branch of the staging.git tree so that I can apply them? Right now they have too many conflicts.
thanks,
greg k-h
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Quoted 4 lines · Greg KH
Can you rebase both of these patches on the staging-testing branch of the staging.git tree so that I can apply them? Right now they have too
many conflicts.
Rebased on staging-testing d92a1fa. v2 to come.
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel