[U-Boot] [PATCH] ubifs: Fix bad free() sequence in ubifs_finddir()
Wolfgang Denk
wd at denx.de
Thu Jul 28 15:27:22 CEST 2011
Free private_data member element before freeing file structure.
This was causing malloc to crash. Also remove unnecessary variable
assigments as file structure gets free'd as well.
Signed-off-by: Rod Boyce <uboot at teamboyce.co.uk>
Signed-off-by: Wolfgang Denk <wd at denx.de>
Cc: Stefan Roese <sr at denx.de>
---
As Rod appears to have disappeared I took the frredom to jump in and
fix this. - wd
fs/ubifs/ubifs.c | 6 ++----
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;
}
--
1.7.6
More information about the U-Boot
mailing list