Преглед изворни кода

qcacld-3.0: Resolve overflow while processing setHostOffload ioctl

qcacld-2.0 to qcacld-3.0 propagation

While processing setHostOffload ioctl there is a possibility of
sending invalid data to lower layers as user sent data structure
is different from local buffer structure.
To mitigate this issue, initialize local buffer to zero and then
update local buffer member by member.

Change-Id: I657d2a8c7d37435b1ad28ef6de60ea80a235ead9
CRs-Fixed: 2152143
Hanumanth Reddy Pothula пре 7 година
родитељ
комит
8fcade5661
1 измењених фајлова са 8 додато и 7 уклоњено
  1. 8 7
      core/hdd/src/wlan_hdd_wext.c

+ 8 - 7
core/hdd/src/wlan_hdd_wext.c

@@ -9415,13 +9415,14 @@ static int __iw_set_host_offload(struct net_device *dev,
 		}
 	}
 
-	/* Execute offload request. The reason that we can copy the
-	 * request information from the ioctl structure to the SME
-	 * structure is that they are laid out exactly the same.
-	 * Otherwise, each piece of information would have to be
-	 * copied individually.
-	 */
-	memcpy(&offloadRequest, pRequest, wrqu->data.length);
+	qdf_mem_zero(&offloadRequest, sizeof(offloadRequest));
+	offloadRequest.offloadType = pRequest->offloadType;
+	offloadRequest.enableOrDisable = pRequest->enableOrDisable;
+	qdf_mem_copy(&offloadRequest.params, &pRequest->params,
+		     sizeof(pRequest->params));
+	qdf_mem_copy(&offloadRequest.bssid, &pRequest->bssId.bytes,
+		     QDF_MAC_ADDR_SIZE);
+
 	if (QDF_STATUS_SUCCESS !=
 	    sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(adapter),
 				 adapter->session_id, &offloadRequest)) {