UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gadget/function/f_fs.c: close leaks 

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>
This commit is contained in:
Al Viro 2015-01-31 23:42:34 -05:00
parent d879cb8341
commit de2080d41b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/usb/gadget/function/f_fs.c
View File

@ -970,6 +970,7 @@ static ssize_t ffs_epfile_aio_write(struct kiocb *kiocb,
unsigned long nr_segs, loff_t loff) unsigned long nr_segs, loff_t loff)
{ {
struct ffs_io_data *io_data; struct ffs_io_data *io_data;
ssize_t res;
ENTER(); ENTER();
@ -989,7 +990,10 @@ static ssize_t ffs_epfile_aio_write(struct kiocb *kiocb,
kiocb_set_cancel_fn(kiocb, ffs_aio_cancel); 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, static ssize_t ffs_epfile_aio_read(struct kiocb *kiocb,
@ -998,6 +1002,7 @@ static ssize_t ffs_epfile_aio_read(struct kiocb *kiocb,
{ {
struct ffs_io_data *io_data; struct ffs_io_data *io_data;
struct iovec *iovec_copy; struct iovec *iovec_copy;
ssize_t res;
ENTER(); ENTER();
@ -1025,7 +1030,12 @@ static ssize_t ffs_epfile_aio_read(struct kiocb *kiocb,
kiocb_set_cancel_fn(kiocb, ffs_aio_cancel); 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 static int