staging: rtl8723bs: Fix some indenting problems and a potential data overrun

Smatch reports the following:

  CHECK   drivers/staging/rtl8723bs/core/rtw_wlan_util.c
drivers/staging/rtl8723bs/core/rtw_wlan_util.c:67 cckrates_included() warn: if statement not indented
drivers/staging/rtl8723bs/core/rtw_wlan_util.c:81 cckratesonly_included() warn: if statement not indented
drivers/staging/rtl8723bs/core/rtw_wlan_util.c:815 rtw_camid_alloc() warn: should '1 << (cam_id)' be a 64 bit type?

The first two are fixed with white-space changes. The third is fixed by
restricting cam_id to be less than 32.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
index c966241df2ea699d02f148388eb7ed41290a0fcc..f485f541e36d0ca4d6a364993ea69751733b76bc 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
+++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c
@@ -65,8 +65,8 @@ int cckrates_included(unsigned char *rate, int ratelen)
 
        for (i = 0; i < ratelen; i++) {
                if  ((((rate[i]) & 0x7f) == 2)  || (((rate[i]) & 0x7f) == 4) ||
-                          (((rate[i]) & 0x7f) == 11)  || (((rate[i]) & 0x7f) == 22))
-               return true;
+                    (((rate[i]) & 0x7f) == 11)  || (((rate[i]) & 0x7f) == 22))
+                       return true;
        }
 
        return false;
@@ -79,8 +79,8 @@ int cckratesonly_included(unsigned char *rate, int ratelen)
 
        for (i = 0; i < ratelen; i++) {
                if  ((((rate[i]) & 0x7f) != 2) && (((rate[i]) & 0x7f) != 4) &&
-                          (((rate[i]) & 0x7f) != 11)  && (((rate[i]) & 0x7f) != 22))
-               return false;
+                    (((rate[i]) & 0x7f) != 11)  && (((rate[i]) & 0x7f) != 22))
+                       return false;
        }
 
        return true;
@@ -811,7 +811,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid)
        }
 
 bitmap_handle:
-       if (cam_id >= 0)
+       if (cam_id >= 0 && cam_id < 32)
                cam_ctl->bitmap |= BIT(cam_id);
 
        spin_unlock_bh(&cam_ctl->lock);