From: Richard Weinberger <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit aeeb14f763917ccf639a602cfbeee6957fd944a2 upstream. If ubifs_tnc_next_ent() returns something else than -ENOENT we leak file->private_data. Signed-off-by: Richard Weinberger <[email protected]> Reviewed-by: David Gstir <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- fs/ubifs/dir.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 6b4947f75af7..9bd17a857667 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -447,13 +447,14 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx) } out: + kfree(file->private_data); + file->private_data = NULL; + if (err != -ENOENT) { ubifs_err("cannot find next direntry, error %d", err); return err; } - kfree(file->private_data); - file->private_data = NULL; /* 2 is a special value indicating that there are no more direntries */ ctx->pos = 2; return 0; -- 2.10.2
