瀏覽代碼

ath9k_htc: fix NULL-deref at probe

Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer or accessing memory beyond the endpoint array should a
malicious device lack the expected endpoints.

Fixes: 36bcce430657 ("ath9k_htc: Handle storage devices")
Cc: stable <stable@vger.kernel.org>     # 2.6.39+
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Johan Hovold 8 年之前
父節點
當前提交
ebeb36670e
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      drivers/net/wireless/ath/ath9k/hif_usb.c

+ 3 - 0
drivers/net/wireless/ath/ath9k/hif_usb.c

@@ -1220,6 +1220,9 @@ static int send_eject_command(struct usb_interface *interface)
 	u8 bulk_out_ep;
 	u8 bulk_out_ep;
 	int r;
 	int r;
 
 
+	if (iface_desc->desc.bNumEndpoints < 2)
+		return -ENODEV;
+
 	/* Find bulk out endpoint */
 	/* Find bulk out endpoint */
 	for (r = 1; r >= 0; r--) {
 	for (r = 1; r >= 0; r--) {
 		endpoint = &iface_desc->endpoint[r].desc;
 		endpoint = &iface_desc->endpoint[r].desc;