commit 6613f9cc18d2b4e11ba038074d5d7a2af609625b
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Fri Sep 28 13:06:06 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 28 13:06:06 2018 -0700
tree 5ac3917a3170bca0f04be153662dc53ba8d56a09
parent da1488c6118dc4fc217e23231d9f40697c5fce60
parent 3a5ecffce5eda8ea6ee41fcf46fae53d25b0c6a4

Merge "wlan: Avoid possible information leak in send_btc_nlink_msg" into wlan-driver.lnx.1.0

CORE/SVC/src/btc/wlan_btc_svc.c

diff --git a/CORE/SVC/src/btc/wlan_btc_svc.c b/CORE/SVC/src/btc/wlan_btc_svc.c
index f64605d..489544b 100644
--- a/CORE/SVC/src/btc/wlan_btc_svc.c
+++ b/CORE/SVC/src/btc/wlan_btc_svc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013, 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013, 2017-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -56,12 +56,14 @@
    struct nlmsghdr *nlh;
    tAniMsgHdr *aniHdr;
    tWlanAssocData *assocData;
-   skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL);
+   uint32_t skb_size = NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD);
+   skb = alloc_skb(skb_size, GFP_KERNEL);
    if(skb == NULL) {
       VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
          "BTC: alloc_skb failed\n");
       return;
    }   
+   vos_mem_zero(skb->data, skb_size);
    nlh = (struct nlmsghdr *)skb->data;
    nlh->nlmsg_pid = 0;  /* from kernel */
    nlh->nlmsg_flags = 0;