ubifs: Call ubifs_iput when ubifs_iget is used

The inode should be freed after a reference is get to avoid
memory leak

Tested-by: Alexander Dahl <ada@thorsis.com>
Link: https://lore.kernel.org/u-boot/b698ec3e-d857-6512-8cc9-4edcab0a41b9@denx.de/T/#t
Link: https://lore.kernel.org/all/8f3a7059-6330-f332-8e9f-729b853e001e@denx.de/T/
Co-developed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 03ed603d0eab8fdce6f25ef527c66aa96a546aa1..7718081f0937ce038f5237256caadc40630ae050 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2324,6 +2324,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
                goto out_umount;
        }
 #else
+       ubifs_iput(root);
        sb->s_root = NULL;
 #endif
 

diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index 8b9bf125ab977baa463586fff860b750fc0f23f6..398b076d783af46421bf9dcabb51886a2a3db586 100644 (file)
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -319,9 +319,7 @@ static int filldir(struct ubifs_info *c, const char *name, int namlen,
        }
        ctime_r((time_t *)&inode->i_mtime, filetime);
        printf("%9lld  %24.24s  ", inode->i_size, filetime);
-#ifndef __UBOOT__
        ubifs_iput(inode);
-#endif
 
        printf("%s\n", name);
 
@@ -557,6 +555,7 @@ static unsigned long ubifs_findfile(struct super_block *sb, char *filename)
 
                        /* We have some sort of symlink recursion, bail out */
                        if (symlink_count++ > 8) {
+                               ubifs_iput(inode);
                                printf("Symlink recursion, aborting\n");
                                return 0;
                        }
@@ -568,6 +567,7 @@ static unsigned long ubifs_findfile(struct super_block *sb, char *filename)
                                 * the leading slash */
                                next = name = link_name + 1;
                                root_inum = 1;
+                               ubifs_iput(inode);
                                continue;
                        }
                        /* Relative to cur dir */
@@ -575,6 +575,7 @@ static unsigned long ubifs_findfile(struct super_block *sb, char *filename)
                                        link_name, next == NULL ? "" : next);
                        memcpy(symlinkpath, buf, sizeof(buf));
                        next = name = symlinkpath;
+                       ubifs_iput(inode);
                        continue;
                }
 
@@ -583,8 +584,10 @@ static unsigned long ubifs_findfile(struct super_block *sb, char *filename)
                 */
 
                /* Found the node!  */
-               if (!next || *next == '\0')
+               if (!next || *next == '\0') {
+                       ubifs_iput(inode);
                        return inum;
+               }
 
                root_inum = inum;
                name = next;