Commit b9ce8700 authored by Richard Weinberger's avatar Richard Weinberger Committed by Sasha Levin

UBIFS: Fix possible memory leak in ubifs_readdir()

[ Upstream commit aeeb14f7 ]

If ubifs_tnc_next_ent() returns something else than -ENOENT
we leak file->private_data.
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Reviewed-by: default avatarDavid Gstir <david@sigma-star.at>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent cad1ca2a
...@@ -449,13 +449,14 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx) ...@@ -449,13 +449,14 @@ static int ubifs_readdir(struct file *file, struct dir_context *ctx)
} }
out: out:
kfree(file->private_data);
file->private_data = NULL;
if (err != -ENOENT) { if (err != -ENOENT) {
ubifs_err(c, "cannot find next direntry, error %d", err); ubifs_err(c, "cannot find next direntry, error %d", err);
return err; return err;
} }
kfree(file->private_data);
file->private_data = NULL;
/* 2 is a special value indicating that there are no more direntries */ /* 2 is a special value indicating that there are no more direntries */
ctx->pos = 2; ctx->pos = 2;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment