Skip to contentSkip to conversation

Btrfs: don't leak transaction in btrfs_sync_file()

PATCH Superseded Filipe David Borba Manana 1 participant 2 messages Sep 11, 2013 – Sep 12, 2013 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Btrfs: don't leak transaction in btrfs_sync_file()

In btrfs_sync_file(), if the call to btrfs_log_dentry_safe() returns a negative error (for e.g. -ENOMEM via btrfs_log_inode()), we would return without ending/freeing the transaction.

---
 fs/btrfs/file.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/file.c +2 -2
index 5ba87b0..d12107e 100644
@@ -1859,8 +1859,8 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 
 	ret = btrfs_log_dentry_safe(trans, root, dentry);
 	if (ret < 0) {
-		mutex_unlock(&inode->i_mutex);
-		goto out;
+		/* Fallthrough and commit/free transaction. */
+		ret = 1;
 	}
 
 	/* we've logged all the items and now have a consistent
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 Btrfs: don't leak transaction in btrfs_sync_file()

In btrfs_sync_file(), if the call to btrfs_log_dentry_safe() returns a negative error (for e.g. -ENOMEM via btrfs_log_inode()), we would return without ending/freeing the transaction.

---

V2: If btrfs_log_dentry_safe() returns error, don't fall through because
that will override the final return value, and can make us return success (0) instead of an error.

 fs/btrfs/file.c |    1 +
 1 file changed, 1 insertion(+)
fs/btrfs/file.c +1 -0
index 5ba87b0..8c305f5 100644
@@ -1860,6 +1860,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 	ret = btrfs_log_dentry_safe(trans, root, dentry);
 	if (ret < 0) {
 		mutex_unlock(&inode->i_mutex);
+		btrfs_end_transaction(trans, root);
 		goto out;
 	}
 
Signature · 1 line
1.7.9.5