Skip to content

Commit

Permalink
gadget/function/f_fs.c: close leaks
Browse files Browse the repository at this point in the history
If ffs_epfile_io() fails in AIO case, we end up leaking io_data
(and iovec_copy in case of AIO read).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Feb 18, 2015
1 parent d879cb8 commit de2080d
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/usb/gadget/function/f_fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,6 +970,7 @@ static ssize_t ffs_epfile_aio_write(struct kiocb *kiocb,
unsigned long nr_segs, loff_t loff)
{
struct ffs_io_data *io_data;
ssize_t res;

ENTER();

Expand All @@ -989,7 +990,10 @@ static ssize_t ffs_epfile_aio_write(struct kiocb *kiocb,

kiocb_set_cancel_fn(kiocb, ffs_aio_cancel);

return ffs_epfile_io(kiocb->ki_filp, io_data);
res = ffs_epfile_io(kiocb->ki_filp, io_data);
if (res != -EIOCBQUEUED)
kfree(io_data);
return res;
}

static ssize_t ffs_epfile_aio_read(struct kiocb *kiocb,
Expand All @@ -998,6 +1002,7 @@ static ssize_t ffs_epfile_aio_read(struct kiocb *kiocb,
{
struct ffs_io_data *io_data;
struct iovec *iovec_copy;
ssize_t res;

ENTER();

Expand Down Expand Up @@ -1025,7 +1030,12 @@ static ssize_t ffs_epfile_aio_read(struct kiocb *kiocb,

kiocb_set_cancel_fn(kiocb, ffs_aio_cancel);

return ffs_epfile_io(kiocb->ki_filp, io_data);
res = ffs_epfile_io(kiocb->ki_filp, io_data);
if (res != -EIOCBQUEUED) {
kfree(io_data);
kfree(iovec_copy);
}
return res;
}

static int
Expand Down

0 comments on commit de2080d

Please sign in to comment.