fs: sysv: Fix sysv_nblocks() returns wrong value

Chen Zhongjin · gregkh · commit 337b68da6856 · 2022-12-31T13:14:05.000+01:00
[ Upstream commit e0c49bd ] sysv_nblocks() returns 'blocks' rather than 'res', which only counting the number of triple-indirect blocks and causing sysv_getattr() gets a wrong result. [AV: this is actually a sysv counterpart of minixfs fix - 0fcd426de9d0 "[PATCH] minix block usage counting fix" in historical tree; mea culpa, should've thought to check fs/sysv back then...] Fixes: 1da177e ("Linux-2.6.12-rc2") Signed-off-by: Chen Zhongjin <chenzhongjin@huawei.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
@@ -438,7 +438,7 @@ static unsigned sysv_nblocks(struct super_block *s, loff_t size)
 		res += blocks;
 		direct = 1;
 	}
-	return blocks;
+	return res;
 }
 
 int sysv_getattr(struct user_namespace *mnt_userns, const struct path *path,

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ static unsigned sysv_nblocks(struct super_block *s, loff_t size)`
`438`	`438`	`res += blocks;`
`439`	`439`	`direct = 1;`
`440`	`440`	`}`
`441`		`- return blocks;`
	`441`	`+ return res;`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`int sysv_getattr(struct user_namespace mnt_userns, const struct path path,`