From: Richard Weinberger <richard@nod.at>
Date: Mon, 12 Oct 2015 21:35:36 +0000 (+0200)
Subject: UBIFS: Fix possible memory leak in ubifs_readdir()
X-Git-Tag: v4.4-rc1~47^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=aeeb14f763917ccf639a602cfbeee6957fd944a2;p=linux.git

UBIFS: Fix possible memory leak in ubifs_readdir()

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

Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: David Gstir <david@sigma-star.at>
---

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 1dd9267c165b..a2f9d978b110 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -449,13 +449,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;