From patchwork Thu Sep 12 09:37:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 2877211 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 82F3EBF43F for ; Thu, 12 Sep 2013 09:38:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2ADBE202DD for ; Thu, 12 Sep 2013 09:38:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C24342021C for ; Thu, 12 Sep 2013 09:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754873Ab3ILJh7 (ORCPT ); Thu, 12 Sep 2013 05:37:59 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:34951 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751510Ab3ILJh5 (ORCPT ); Thu, 12 Sep 2013 05:37:57 -0400 Received: by mail-we0-f169.google.com with SMTP id t60so9126050wes.14 for ; Thu, 12 Sep 2013 02:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N5g6jTgKeR6H9ilPZU6xg4F4UgWXt/WICEb1vugxWI0=; b=MnaReMcCvNZuTJz3T5hTRrxq0JhaJxCglC/HqXdGoqlTd/DEXYR5S50Y1ec20MpcEu kEej3X6HkUMzjmGw7KYk4wuNW1OlWbFZfaFTt2gM/+XWsX/R532qdnMw+CLwtmaQSWn8 n7/af7ydEikBQjyOvK4yiAMpURQP3B8HibWvzGiusS6Yn9bvzj+JF7aUUNdBXYF3xNsE 1JQE1kKSun4/FIaMDMuttTciXV/Psol2HovTLfjdXp0RVjyodf+SrAS9mwi2p4aY2Pi0 WsJo67DjWalHAwV6iV65hQcLN+oYh2AFZmHLxIGB6ibnhclcjQFQ4gKBZHphchg4NqaH OIag== X-Received: by 10.180.210.231 with SMTP id mx7mr5065692wic.5.1378978676285; Thu, 12 Sep 2013 02:37:56 -0700 (PDT) Received: from storm-desktop.lan (bl5-172-250.dsl.telepac.pt. [82.154.172.250]) by mx.google.com with ESMTPSA id dq11sm16279381wid.3.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 02:37:55 -0700 (PDT) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: jbacik@fusionio.com, Filipe David Borba Manana Subject: [PATCH v2] Btrfs: don't leak transaction in btrfs_sync_file() Date: Thu, 12 Sep 2013 10:37:24 +0100 Message-Id: <1378978644-21280-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1378928204-12641-1-git-send-email-fdmanana@gmail.com> References: <1378928204-12641-1-git-send-email-fdmanana@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Filipe David Borba Manana --- 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(+) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 5ba87b0..8c305f5 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -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; }