[RAMEN9610-13634][common][7570][7872][7885][9610] wlbt: Prevent issues in nl80211_ven...

Changes done to fix prevent issues in nl80211_vendor.c
and cfg80211_ops.c files.

Change-Id: Icffd273de1c0a0dde1e201b73fc3709df0e5e1d4
SCSC-Bug-Id: SSB-50792
Signed-off-by: Srishti Piplani <srishti.p@samsung.com>

diff --git a/drivers/net/wireless/scsc/cfg80211_ops.c b/drivers/net/wireless/scsc/cfg80211_ops.c
index b3f6f9f1dda29ae36d8cabb4da51833c4495b4de..1704f7b99d9f9af07e8c3887fd787eb0c9a97b5d 100755 (executable)
--- a/drivers/net/wireless/scsc/cfg80211_ops.c
+++ b/drivers/net/wireless/scsc/cfg80211_ops.c
@@ -839,14 +839,16 @@ int slsi_connect(struct wiphy *wiphy, struct net_device *dev,
        if (WARN_ON(sme->ssid_len > IEEE80211_MAX_SSID_LEN))
                goto exit_with_error;
 
-       if ((SLSI_IS_VIF_INDEX_WLAN(ndev_vif)) && (sdev->p2p_state == P2P_GROUP_FORMED_CLI)) {
-               p2p_dev = slsi_get_netdev(sdev, SLSI_NET_INDEX_P2PX_SWLAN);
-               if (p2p_dev) {
-                       ndev_p2p_vif  = netdev_priv(p2p_dev);
-                       if (ndev_p2p_vif->sta.sta_bss) {
-                               if (SLSI_ETHER_EQUAL(ndev_p2p_vif->sta.sta_bss->bssid, sme->bssid)) {
-                                       SLSI_NET_ERR(dev, "Connect Request Rejected\n");
-                                       goto exit_with_error;
+       if (sme->bssid) {
+               if ((SLSI_IS_VIF_INDEX_WLAN(ndev_vif)) && (sdev->p2p_state == P2P_GROUP_FORMED_CLI)) {
+                       p2p_dev = slsi_get_netdev(sdev, SLSI_NET_INDEX_P2PX_SWLAN);
+                       if (p2p_dev) {
+                               ndev_p2p_vif  = netdev_priv(p2p_dev);
+                               if (ndev_p2p_vif->sta.sta_bss) {
+                                       if (SLSI_ETHER_EQUAL(ndev_p2p_vif->sta.sta_bss->bssid, sme->bssid)) {
+                                               SLSI_NET_ERR(dev, "Connect Request Rejected\n");
+                                               goto exit_with_error;
+                                       }
                                }
                        }
                }

diff --git a/drivers/net/wireless/scsc/nl80211_vendor.c b/drivers/net/wireless/scsc/nl80211_vendor.c
index e2655e6c8d17a1d6fd84b88078e532be45feb70d..51874ef1f878ada5e50a1b3978489671af17f25e 100755 (executable)
--- a/drivers/net/wireless/scsc/nl80211_vendor.c
+++ b/drivers/net/wireless/scsc/nl80211_vendor.c
@@ -5369,11 +5369,11 @@ void slsi_rx_event_log_indication(struct slsi_dev *sdev, struct net_device *dev,
        u16 event_id = 0;
        u64 timestamp = 0;
        u8 *tlv_data;
-       u32 roam_reason, chan_utilisation, btm_request_mode, btm_response, eapol_msg_type;
-       u32 deauth_reason, eapol_retry_count, roam_rssi, status_code;
-       u16 vendor_len, tag_id, tag_len, vtag_id, eapol_key_type;
+       u32 roam_reason = 0, chan_utilisation = 0, btm_request_mode = 0, btm_response = 0, eapol_msg_type = 0;
+       u32 deauth_reason = 0, eapol_retry_count = 0, roam_rssi, status_code = 0;
+       u16 vendor_len, tag_id, tag_len, vtag_id, eapol_key_type = 0;
        u32 tag_value, vtag_value, rssi_bits = 0;
-       int roam_rssi_val;
+       int roam_rssi_val = 0;
        __le16               *le16_ptr = NULL;
        int tlv_buffer__len = fapi_get_datalen(skb), i = 0;