Skip to contentSkip to conversation

fuse: fix NULL dereference when new_inode() fails

PATCH In review Stefan Hajnoczi 2 participants 4 messages May 24, 2018 – Jun 1, 2018

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

PATCH 1/1 fuse: fix NULL dereference when new_inode() fails

fuse_ctl_remove_conn() dereferences d_inode(fc->ctl_dentry[i]). If fuse_ctl_add_dentry() failed to allocate the inode then this field is NULL and it's not safe to call fuse_ctl_remove_conn().

This patch frees partially initialized dentries in the fuse_ctl_add_dentry() error case to solve the NULL dereference.

---
I spotted this when reading the code. Compile-tested only.

 fs/fuse/control.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
fs/fuse/control.c +5 -2
index b9ea99c5b5b3..ef3af9c32147 100644
@@ -211,10 +211,13 @@ static struct dentry *fuse_ctl_add_dentry(struct dentry *parent,
 	if (!dentry)
 		return NULL;
 
-	fc->ctl_dentry[fc->ctl_ndents++] = dentry;
 	inode = new_inode(fuse_control_sb);
-	if (!inode)
+	if (!inode) {
+		dput(dentry);
 		return NULL;
+	}
+
+	fc->ctl_dentry[fc->ctl_ndents++] = dentry;
 
 	inode->i_ino = get_next_ino();
 	inode->i_mode = mode;
Signature · 1 line
2.17.0