Commit d993670c authored by Thomas Pugliese's avatar Thomas Pugliese Committed by Greg Kroah-Hartman

usb: wusbcore: allow wa_xfer_destroy to clean up partially constructed xfers

If __wa_xfer_setup fails, it can leave a partially constructed wa_xfer
object.  The error handling code eventually calls wa_xfer_destroy which
does not check for NULL before dereferencing xfer->seg which could cause
a kernel panic.  This change also makes sure to free xfer->seg which was
being leaked for all transfers before this change.
Signed-off-by: default avatarThomas Pugliese <thomas.pugliese@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0367eef2
......@@ -178,10 +178,16 @@ static void wa_xfer_destroy(struct kref *_xfer)
if (xfer->seg) {
unsigned cnt;
for (cnt = 0; cnt < xfer->segs; cnt++) {
if (xfer->seg[cnt]) {
if (xfer->seg[cnt]->dto_urb) {
kfree(xfer->seg[cnt]->dto_urb->sg);
usb_free_urb(xfer->seg[cnt]->dto_urb);
}
usb_free_urb(&xfer->seg[cnt]->tr_urb);
}
}
kfree(xfer->seg);
}
kfree(xfer);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment