tmpfs: fix uninitialized return value in shmem_link

djwong · torvalds · commit 29b00e609960 · 2019-02-25T11:49:22.000-08:00
When we made the shmem_reserve_inode call in shmem_link conditional, we forgot to update the declaration for ret so that it always has a known value. Dan Carpenter pointed out this deficiency in the original patch. Fixes: 1062af9 ("tmpfs: fix link accounting when a tmpfile is linked in") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Hugh Dickins <hughd@google.com> Cc: Matej Kupljen <matej.kupljen@gmail.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/shmem.c b/mm/shmem.c
@@ -2848,7 +2848,7 @@ static int shmem_create(struct inode *dir, struct dentry *dentry, umode_t mode,
 static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 {
 	struct inode *inode = d_inode(old_dentry);
-	int ret;
+	int ret = 0;
 
 	/*
 	 * No ordinary (disk based) filesystem counts links as inodes;

Original file line number	Diff line number	Diff line change
`@@ -2848,7 +2848,7 @@ static int shmem_create(struct inode dir, struct dentry dentry, umode_t mode,`
`2848`	`2848`	`static int shmem_link(struct dentry old_dentry, struct inode dir, struct dentry *dentry)`
`2849`	`2849`	`{`
`2850`	`2850`	`struct inode *inode = d_inode(old_dentry);`
`2851`		`- int ret;`
	`2851`	`+ int ret = 0;`
`2852`	`2852`
`2853`	`2853`	`/*`
`2854`	`2854`	`* No ordinary (disk based) filesystem counts links as inodes;`