From ee9dc4dcdc98292e482f3a400cbe41df3d56988e Mon Sep 17 00:00:00 2001 From: Jaya Prakash Sangaru Date: Mon, 13 May 2019 14:49:14 +0530 Subject: [PATCH] [NEUS7920-477] [9610][7885] wlbt: fix NAN kernel panic In nan followup ind stack is corrputed. This fixes this issue. Change-Id: Id519899637abaca5bba2a9b09a82f5b7d031aa22 SCSC-Bug-Id: SSB-52644 Signed-off-by: Jaya Prakash Sangaru --- drivers/net/wireless/scsc/nl80211_vendor_nan.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/scsc/nl80211_vendor_nan.c b/drivers/net/wireless/scsc/nl80211_vendor_nan.c index d91c8b562f8d..4dc1c201be49 100755 --- a/drivers/net/wireless/scsc/nl80211_vendor_nan.c +++ b/drivers/net/wireless/scsc/nl80211_vendor_nan.c @@ -1359,7 +1359,7 @@ void slsi_nan_followup_ind(struct slsi_dev *sdev, struct net_device *dev, struct kfree(stitched_ie_p); return; } - memset(&hal_evt, 0, sizeof(hal_evt)); + memset(hal_evt, 0, sizeof(*hal_evt)); stitched_ie_len = slsi_nan_stitch_ie(fapi_get_data(skb), stitched_ie_len, 0x050b, stitched_ie_p); if (!stitched_ie_len) { SLSI_ERR(sdev, "No followup ind IE\n"); @@ -1449,7 +1449,6 @@ void slsi_nan_service_ind(struct slsi_dev *sdev, struct net_device *dev, struct struct slsi_hal_nan_further_availability_channel *famchan; struct nlattr *nlattr_nested; - SLSI_DBG3(sdev, SLSI_GSCAN, "\n"); stitched_ie_len = fapi_get_datalen(skb); /* max length of stitched_ie */ -- 2.20.1