Merge tag 'configfs-for-5.7' of git://git.infradead.org/users/hch/configfs

torvalds · torvalds · commit de268ccb42d6 · 2020-05-07T09:48:37.000-07:00
Pull configfs fix from Christoph Hellwig:
 "Fix a refcount leak in configfs_rmdir (Xiyu Yang)"

* tag 'configfs-for-5.7' of git://git.infradead.org/users/hch/configfs:
  configfs: fix config_item refcnt leak in configfs_rmdir()
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
@@ -1519,6 +1519,7 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry)
 		spin_lock(&configfs_dirent_lock);
 		configfs_detach_rollback(dentry);
 		spin_unlock(&configfs_dirent_lock);
+		config_item_put(parent_item);
 		return -EINTR;
 	}
 	frag->frag_dead = true;

Original file line number	Diff line number	Diff line change
`@@ -1519,6 +1519,7 @@ static int configfs_rmdir(struct inode dir, struct dentry dentry)`
`1519`	`1519`	`spin_lock(&configfs_dirent_lock);`
`1520`	`1520`	`configfs_detach_rollback(dentry);`
`1521`	`1521`	`spin_unlock(&configfs_dirent_lock);`
	`1522`	`+ config_item_put(parent_item);`
`1522`	`1523`	`return -EINTR;`
`1523`	`1524`	`}`
`1524`	`1525`	`frag->frag_dead = true;`