Commit baf2b5fa authored Oct 12, 2015 by Richard Weinberger Committed by Nikhilesh Reddy Feb 11, 2016

UBIFS: Fix possible memory leak in ubifs_readdir()



If ubifs_tnc_next_ent() returns something else than -ENOENT
we leak file->private_data.

CRs-Fixed: 975289
Change-Id: I0194a58b45a8d4f103c67e48aafcdfa655dba92e
Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: David Gstir <david@sigma-star.at>
Git-commit: aeeb14f763917ccf639a602cfbeee6957fd944a2
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: Nikhilesh Reddy <reddyn@codeaurora.org>

parent bb4492f0

fs/ubifs/dir.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -451,13 +451,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(c, "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;