diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-02-01 15:53:34 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-06 11:38:14 -0800 |
| commit | f07af4b630d52fb911574031ed7feb9252e65f24 (patch) | |
| tree | e7ca5961f68f949bef0dbaa2d3339dc04cba672b /drivers/usb/wusbcore/wa-xfer.c | |
| parent | 4d2079c190558dfa9b766a90a34cb30b8d49c8eb (diff) | |
| download | linux-f07af4b630d52fb911574031ed7feb9252e65f24.tar.gz linux-f07af4b630d52fb911574031ed7feb9252e65f24.tar.bz2 linux-f07af4b630d52fb911574031ed7feb9252e65f24.zip | |
USB: wusbcore/wa-xfer: error handling fixes in setup_segs()
1) It didn't free xfer->seg[0] so there was a leak.
2) xfer->seg[cnt] can be NULL.
3) Use usb_free_urb() for ->dto_urb instead of kfree().
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/wusbcore/wa-xfer.c')
| -rw-r--r-- | drivers/usb/wusbcore/wa-xfer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c index 57c01ab09ad8..6ef94bce8c0d 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c @@ -695,9 +695,9 @@ error_dto_alloc: cnt--; error_seg_kzalloc: /* use the fact that cnt is left at were it failed */ - for (; cnt > 0; cnt--) { - if (xfer->is_inbound == 0) - kfree(xfer->seg[cnt]->dto_urb); + for (; cnt >= 0; cnt--) { + if (xfer->seg[cnt] && xfer->is_inbound == 0) + usb_free_urb(xfer->seg[cnt]->dto_urb); kfree(xfer->seg[cnt]); } error_segs_kzalloc: |