瀏覽代碼

qcacld-3.0: Use total_len in drv_cmd_p2p_dev_addr()

Avoid userspace overwrite in drv_cmd_p2p_dev_addr() by intersecting the
max output buffer size with the total length of the userspace buffer.
This avoids the overwrite in cases where the allocated userspace buffer
is smaller than the max output buffer size.

Change-Id: I55c6d4b277e5964a7978daceffbe4eb72014c06d
CRs-Fixed: 2222846
Dustin Brown 7 年之前
父節點
當前提交
ee22071a17
共有 1 個文件被更改,包括 11 次插入12 次删除
  1. 11 12
      core/hdd/src/wlan_hdd_ioctl.c

+ 11 - 12
core/hdd/src/wlan_hdd_ioctl.c

@@ -2847,25 +2847,24 @@ static int drv_cmd_p2p_dev_addr(struct hdd_adapter *adapter,
 				uint8_t command_len,
 				struct hdd_priv_data *priv_data)
 {
-	int ret = 0;
+	struct qdf_mac_addr *addr = &hdd_ctx->p2p_device_address;
+	size_t user_size = qdf_min(sizeof(addr->bytes),
+				   (size_t)priv_data->total_len);
 
 	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL,
 			 adapter->session_id,
-			(unsigned int)(*(hdd_ctx->p2p_device_address.bytes + 2)
-				<< 24 | *(hdd_ctx->p2p_device_address.bytes
-				+ 3) << 16 | *(hdd_ctx->
-				p2p_device_address.bytes + 4) << 8 |
-				*(hdd_ctx->p2p_device_address.bytes +
-				5))));
-
-	if (copy_to_user(priv_data->buf, hdd_ctx->p2p_device_address.bytes,
-			 sizeof(tSirMacAddr))) {
+			 (unsigned int)(*(addr->bytes + 2) << 24 |
+				*(addr->bytes + 3) << 16 |
+				*(addr->bytes + 4) << 8 |
+				*(addr->bytes + 5))));
+
+	if (copy_to_user(priv_data->buf, addr->bytes, user_size)) {
 		hdd_err("failed to copy data to user buffer");
-		ret = -EFAULT;
+		return -EFAULT;
 	}
 
-	return ret;
+	return 0;
 }
 
 /**