From patchwork Tue Jun 23 10:39:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: robbieko X-Patchwork-Id: 6659521 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 926E4C05AC for ; Tue, 23 Jun 2015 10:41:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6F7B20652 for ; Tue, 23 Jun 2015 10:41:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A50492063F for ; Tue, 23 Jun 2015 10:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932347AbbFWKkD (ORCPT ); Tue, 23 Jun 2015 06:40:03 -0400 Received: from mail.synology.com ([59.124.41.242]:1618 "EHLO mail.synology.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754387AbbFWKkA (ORCPT ); Tue, 23 Jun 2015 06:40:00 -0400 Received: from localhost.localdomain (unknown [192.168.0.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: robbieko@synology.com) by mail.synology.com (Postfix) with ESMTPSA id 5FFA32B3183A; Tue, 23 Jun 2015 18:39:57 +0800 (CST) From: Robbie Ko To: linux-btrfs@vger.kernel.org Cc: Robbie Ko Subject: [PATCH v3 4/7] Btrfs: incremental send, fix orphan_dir_info leak Date: Tue, 23 Jun 2015 18:39:48 +0800 Message-Id: <1435055991-10109-5-git-send-email-robbieko@synology.com> In-Reply-To: <1435055991-10109-1-git-send-email-robbieko@synology.com> References: <1435055991-10109-1-git-send-email-robbieko@synology.com> X-MailScanner-ID: 5FFA32B3183A.AAB3F X-MailScanner: Found to be clean X-MailScanner-SpamCheck: not spam (whitelisted), SpamAssassin (cached, score=1.253, required 8, ALL_TRUSTED -1.00, AWL 2.25, BAYES_40 -0.00, URIBL_BLOCKED 0.00) X-MailScanner-From: robbieko@synology.com X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There's one case where we leak a orphan_dir_info structure. Example: Parent snapshot: |---- a/ (ino 279) |---- c (ino 282) |---- del/ (ino 281) |---- tmp/ (ino 280) |---- long/ (ino 283) |---- longlong/ (ino 284) Send snapshot: |---- a/ (ino 279) |---- long (ino 283) |---- longlong (ino 284) |---- c/ (ino 282) |---- tmp/ (ino 280) Freeing an existing orphan_dir_info for a directory, when we realize we can't rmdir the directory because it has a descendant that wasn't yet processed, and the orphan_dir_info was created because it had a descendant that had its rename operation delayed. Signed-off-by: Robbie Ko --- fs/btrfs/send.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index ca8cb87..194df76 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -2914,6 +2914,11 @@ static int can_rmdir(struct send_ctx *sctx, u64 dir, u64 dir_gen, } if (loc.objectid > send_progress) { + struct orphan_dir_info *odi; + + odi = get_orphan_dir_info(sctx, dir); + if (odi) + free_orphan_dir_info(sctx, odi); ret = 0; goto out; }