Skip to contentSkip to conversation

mm/shmem.c: Fix the missing unaccount on the failed path

PATCH In review Tianjia Zhang 2 participants 3 messages Sep 20, 2020 – Sep 22, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/shmem.c: Fix the missing unaccount on the failed path

In function __shmem_file_setup(), shmem_unacct_size() is forgotten on the failed path, so add it.

Fixes 93dec2da7b234 ("... and switch shmem_file_setup() to alloc_file_pseudo()")
Cc Al Viro <[email protected]>
---
 mm/shmem.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
mm/shmem.c +3 -1
index 8e2b35ba93ad..591410dc3541 100644
@@ -4200,8 +4200,10 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l
 	if (!IS_ERR(res))
 		res = alloc_file_pseudo(inode, mnt, name, O_RDWR,
 				&shmem_file_operations);
-	if (IS_ERR(res))
+	if (IS_ERR(res)) {
 		iput(inode);
+		shmem_unacct_size(flags, size);
+	}
 	return res;
 }
 
Signature · 1 line
2.19.1.3.ge56e4f7
maintainer
#1 lore raw
Quoted 28 lines · Tianjia Zhang

In function __shmem_file_setup(), shmem_unacct_size() is forgotten on the failed path, so add it.

Fixes 93dec2da7b234 ("... and switch shmem_file_setup() to alloc_file_pseudo()")
Cc Al Viro <[email protected]>
---
 mm/shmem.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
mm/shmem.c +3 -1
index 8e2b35ba93ad..591410dc3541 100644
@@ -4200,8 +4200,10 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l
 	if (!IS_ERR(res))
 		res = alloc_file_pseudo(inode, mnt, name, O_RDWR,
 				&shmem_file_operations);
-	if (IS_ERR(res))
+	if (IS_ERR(res)) {
 		iput(inode);
+		shmem_unacct_size(flags, size);
+	}
 	return res;
 }
 
Signature · 1 line
2.19.1.3.ge56e4f7

Looks mistaken to me.

Is this something you noticed by source inspection, or something you have observed in practice?

I haven't tried exercising this path while injecting errors into alloc_file_pseudo(); but what I'd expect to happen is that the iput(inode), which you see already on that error path, will get to evict the inode, which will entail calling shmem_evict_inode(), which does that shmem_unacct_size() itself.

Hugh

#2 lore raw
Quoted 36 lines · Hugh Dickins
Quoted 28 lines · Tianjia Zhang

In function __shmem_file_setup(), shmem_unacct_size() is forgotten on the failed path, so add it.

Fixes 93dec2da7b234 ("... and switch shmem_file_setup() to alloc_file_pseudo()")
Cc Al Viro <[email protected]>
---
  mm/shmem.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
mm/shmem.c +3 -1
index 8e2b35ba93ad..591410dc3541 100644
@@ -4200,8 +4200,10 @@ static struct file *__shmem_file_setup(struct vfsmount *mnt, const char *name, l
  	if (!IS_ERR(res))
  		res = alloc_file_pseudo(inode, mnt, name, O_RDWR,
  				&shmem_file_operations);
-	if (IS_ERR(res))
+	if (IS_ERR(res)) {
  		iput(inode);
+		shmem_unacct_size(flags, size);
+	}
  	return res;
  }
 
Signature · 1 line
2.19.1.3.ge56e4f7

Looks mistaken to me.

Is this something you noticed by source inspection, or something you have observed in practice?

Quoted 8 lines

I haven't tried exercising this path while injecting errors into alloc_file_pseudo(); but what I'd expect to happen is that the iput(inode), which you see already on that error path, will get to evict the inode, which will entail calling shmem_evict_inode(), which does that shmem_unacct_size() itself.

Hugh

I noticed by looking at the code. you are right, I neglected this point, thanks for your explanation.

Thanks,
Tianjia