usbutils allow unrounded control transfers
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/usbutils.c b/usbutils.c
index afad52e..33e8dad 100644
--- a/usbutils.c
+++ b/usbutils.c
@@ -2171,7 +2171,7 @@ int _usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest
struct timeval tv_start, tv_finish;
#endif
uint32_t *buf = NULL;
- int err, i;
+ int err, i, bufsiz;
USBDEBUG("USB debug: _usb_transfer(%s (nodev=%s),type=%"PRIu8",req=%"PRIu8",value=%"PRIu16",index=%"PRIu16",siz=%d,timeout=%u,cmd=%s)", cgpu->drv->name, bool_str(cgpu->usbinfo.nodev), request_type, bRequest, wValue, wIndex, siz, timeout, usb_cmdname(cmd));
@@ -2185,22 +2185,22 @@ int _usb_transfer(struct cgpu_info *cgpu, uint8_t request_type, uint8_t bRequest
USBDEBUG("USB debug: @_usb_transfer() data=%s", bin2hex((unsigned char *)data, (size_t)siz));
if (siz > 0) {
- siz--;
- siz >>= 2;
- siz++;
- buf = malloc(siz << 2);
+ bufsiz = siz - 1;
+ bufsiz >>= 2;
+ bufsiz++;
+ buf = malloc(bufsiz << 2);
if (unlikely(!buf))
quit(1, "Failed to malloc in _usb_transfer");
- for (i = 0; i < siz; i++)
+ for (i = 0; i < bufsiz; i++)
buf[i] = htole32(data[i]);
}
- USBDEBUG("USB debug: @_usb_transfer() buf=%s", bin2hex((unsigned char *)buf, (size_t)(siz << 2)));
+ USBDEBUG("USB debug: @_usb_transfer() buf=%s", bin2hex((unsigned char *)buf, (size_t)siz));
STATS_TIMEVAL(&tv_start);
err = libusb_control_transfer(usbdev->handle, request_type,
bRequest, htole16(wValue), htole16(wIndex),
- (unsigned char *)buf, (uint16_t)(siz << 2),
+ (unsigned char *)buf, (uint16_t)siz,
timeout == DEVTIMEOUT ? usbdev->found->timeout : timeout);
STATS_TIMEVAL(&tv_finish);
USB_STATS(cgpu, &tv_start, &tv_finish, err, cmd, SEQ0);
diff --git a/usbutils.h b/usbutils.h
index 1a24be2..14fc17a 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -71,7 +71,7 @@
#define PL2303_VALUE_CTRL (PL2303_CTRL_DTR | PL2303_CTRL_RTS)
#define PL2303_VALUE_LINE 0
#define PL2303_VALUE_LINE0 0x0001c200
-#define PL2303_VALUE_LINE1 0x08000000
+#define PL2303_VALUE_LINE1 0x080000
#define PL2303_VALUE_LINE_SIZE 7
#define PL2303_VALUE_VENDOR 0