Re: [PATCH] ubifs: Call ubifs_iput when ubifs_iget is used

Hi Heiko

On Sat, Aug 10, 2024 at 1:11 PM Heiko Schocher hs@denx.de wrote:

Hello Michael,

On 07.08.24 17:42, Michael Trimarchi wrote:

...

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/... 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

---

RFC=>V1: - Heiko gives more points to address on the patch and review it - Alexander Dahl test on top of his own series reported in the commit message - add leak on super.c file too from Heiko

---

fs/ubifs/super.c | 1 + fs/ubifs/ubifs.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index d8d78a2d3d..7721e168fb 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2321,6 +2321,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) goto out_umount; } #else

• ubifs_iput(inode);
  sb->s_root = NULL;
  

  #endif

This breaks build:

I was silly not to pay attention on it

Michael

https://dev.azure.com/hs0298/hs/_build/results?buildId=120&view=logs&...

obviously it must be

ubifs_iput(root);

Sorry... can you send a v2 please?

bye, Heiko

...

diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 048730db7f..6acd6c3776 100644 --- 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;
  
  

-- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs@denx.de