Merge "qcacld-3.0: Add proper lengths to payload" into wlan-cld3.driver.lnx.1.1-dev

core/utils/logging/src/wlan_logging_sock_svc.c

@@ -125,7 +125,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio,
 		return -EINVAL;
 	}
 
-	payload_len = wmsg_length + sizeof(wnl->radio);
+	payload_len = wmsg_length + sizeof(wnl->radio) + sizeof(*wmsg);
 	tot_msg_len = NLMSG_SPACE(payload_len);
 	skb = dev_alloc_skb(tot_msg_len);
 	if (skb == NULL) {

core/utils/ptt/src/wlan_ptt_sock_svc.c

@@ -94,7 +94,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid)
 			  __func__, radio);
 		return -EINVAL;
 	}
-	payload_len = wmsg_length + 4;  /* 4 extra bytes for the radio idx */
+	payload_len = wmsg_length + sizeof(wnl->radio) + sizeof(*wmsg);
 	tot_msg_len = NLMSG_SPACE(payload_len);
 	skb = dev_alloc_skb(tot_msg_len);
 	if (skb  == NULL) {