Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: serial: kobil_sct: fix modem-status error handling

Make sure to return -EIO in case of a short modem-status read request.

While at it, split the debug message to not include the (zeroed)
transfer-buffer content in case of errors.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>

+10 -2
+10 -2
drivers/usb/serial/kobil_sct.c
··· 393 393 transfer_buffer_length, 394 394 KOBIL_TIMEOUT); 395 395 396 - dev_dbg(&port->dev, "%s - Send get_status_line_state URB returns: %i. Statusline: %02x\n", 397 - __func__, result, transfer_buffer[0]); 396 + dev_dbg(&port->dev, "Send get_status_line_state URB returns: %i\n", 397 + result); 398 + if (result < 1) { 399 + if (result >= 0) 400 + result = -EIO; 401 + goto out_free; 402 + } 403 + 404 + dev_dbg(&port->dev, "Statusline: %02x\n", transfer_buffer[0]); 398 405 399 406 result = 0; 400 407 if ((transfer_buffer[0] & SUSBCR_GSL_DSR) != 0) 401 408 result = TIOCM_DSR; 409 + out_free: 402 410 kfree(transfer_buffer); 403 411 return result; 404 412 }