summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-08-26 15:54:14 +0200
committerWolfgang Denk <wd@denx.de>2011-08-26 15:54:14 +0200
commit98e99e5a48e8eb3987c89f5316929313601ed7d6 (patch)
tree1a00c051a157646c47d6671c27769e6748d48a27
parent80b350a7ab83653242033877c203940db7ecc0e5 (diff)
parent3267bc1b2b52a8ffd0dfda663c02c86eaab6f70d (diff)
downloadu-boot-imx-98e99e5a48e8eb3987c89f5316929313601ed7d6.zip
u-boot-imx-98e99e5a48e8eb3987c89f5316929313601ed7d6.tar.gz
u-boot-imx-98e99e5a48e8eb3987c89f5316929313601ed7d6.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ubi
* 'master' of git://git.denx.de/u-boot-ubi: ubifs: Fix bad free() sequence in ubifs_finddir()
-rw-r--r--fs/ubifs/ubifs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index 5a5c739..61f70b2 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -360,6 +360,8 @@ out:
return err;
}
+ if (file->private_data)
+ kfree(file->private_data);
if (file)
free(file);
if (dentry)
@@ -367,10 +369,6 @@ out:
if (dir)
free(dir);
- if (file->private_data)
- kfree(file->private_data);
- file->private_data = NULL;
- file->f_pos = 2;
return 0;
}