]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
staging: r8188eu: Calling rtw_get_stainfo() with a NULL sta_addr will return NULL
authorLarry Finger <Larry.Finger@lwfinger.net>
Wed, 9 Apr 2014 16:12:58 +0000 (11:12 -0500)
committerJiri Slaby <jslaby@suse.cz>
Thu, 15 May 2014 07:55:01 +0000 (09:55 +0200)
commit 9452bf560273e4de2395ffdd79024debfb0c1290 upstream.

This makes the follow-on check for psta != NULL pointless and makes
the whole exercise rather pointless. This is another case of why
blindly zero-initializing variables when they are declared is bad.

Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/staging/rtl8188eu/core/rtw_recv.c

index 201165787362b6ea9d1b2a7613b1c8d7457dffe0..33243ed40a1e98d704fd545c4c8fac809c2ea046 100644 (file)
@@ -555,7 +555,7 @@ _func_exit_;
 /* set the security information in the recv_frame */
 static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *precv_frame)
 {
-       u8   *psta_addr = NULL, *ptr;
+       u8   *psta_addr, *ptr;
        uint  auth_alg;
        struct recv_frame_hdr *pfhdr;
        struct sta_info *psta;
@@ -569,7 +569,6 @@ static union recv_frame *portctrl(struct adapter *adapter, union recv_frame *pre
 _func_enter_;
 
        pstapriv = &adapter->stapriv;
-       psta = rtw_get_stainfo(pstapriv, psta_addr);
 
        auth_alg = adapter->securitypriv.dot11AuthAlgrthm;
 
@@ -577,6 +576,7 @@ _func_enter_;
        pfhdr = &precv_frame->u.hdr;
        pattrib = &pfhdr->attrib;
        psta_addr = pattrib->ta;
+       psta = rtw_get_stainfo(pstapriv, psta_addr);
 
        prtnframe = NULL;