浏览代码

USB: visor: fix null-deref at probe

Fix null-pointer dereference at probe should a (malicious) Treo device
lack the expected endpoints.

Specifically, the Treo port-setup hack was dereferencing the bulk-in and
interrupt-in urbs without first making sure they had been allocated by
core.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Johan Hovold 9 年之前
父节点
当前提交
cac9b50b0d
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      drivers/usb/serial/visor.c

+ 5 - 0
drivers/usb/serial/visor.c

@@ -544,6 +544,11 @@ static int treo_attach(struct usb_serial *serial)
 		(serial->num_interrupt_in == 0))
 		(serial->num_interrupt_in == 0))
 		return 0;
 		return 0;
 
 
+	if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) {
+		dev_err(&serial->interface->dev, "missing endpoints\n");
+		return -ENODEV;
+	}
+
 	/*
 	/*
 	* It appears that Treos and Kyoceras want to use the
 	* It appears that Treos and Kyoceras want to use the
 	* 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,
 	* 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,