From patchwork Tue Nov 19 16:07:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3203211 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5E89D9F3A0 for ; Tue, 19 Nov 2013 16:08:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4240D202DD for ; Tue, 19 Nov 2013 16:08:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2907A2018A for ; Tue, 19 Nov 2013 16:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753513Ab3KSQIK (ORCPT ); Tue, 19 Nov 2013 11:08:10 -0500 Received: from mail-wi0-f181.google.com ([209.85.212.181]:34214 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752962Ab3KSQII (ORCPT ); Tue, 19 Nov 2013 11:08:08 -0500 Received: by mail-wi0-f181.google.com with SMTP id f4so5690388wiw.2 for ; Tue, 19 Nov 2013 08:08:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=6qT6GZhUdmSg8T+a1u+uVzW6P0CK5KeI5zKVGoqEFfY=; b=AmNq2KhgY+RvanfwtsLEcAJe8d17xGI8zKAYaPNUMwXtyDVI9W8eoU8o/+O6LeVowV BWWPqnurSoEvhmWFYfMtgn5RMWyfnA0bOw/T47sY6Y+gYlid5Z50CQaV4NvsmYz0ZCGn 2xN3JAsrI6Ylu4ve0zOv84lzecQvLInrFw7442kkSPoLmqQmMoNjyFNwcRSJx2HW7fUi Lfov/gHwBTRoT9DvC25m687Mm2kRLdiJBS2MO1wSk40R5kH+wXqZ7zKwYGJKdVUAVHGf r2jbZC/TQ7PK9g5nZLb2g7nKnroC0iJfNqeNEhD3CyYtcC1wSaDQskI9zxFel37/4R78 oL/w== X-Received: by 10.180.92.230 with SMTP id cp6mr3044839wib.0.1384877286988; Tue, 19 Nov 2013 08:08:06 -0800 (PST) Received: from storm-desktop.lan (bl14-141-156.dsl.telepac.pt. [85.247.141.156]) by mx.google.com with ESMTPSA id c10sm6976995wie.11.2013.11.19.08.08.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 08:08:06 -0800 (PST) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH] Btrfs: add missing sysfs group remove / fix leak Date: Tue, 19 Nov 2013 16:07:47 +0000 Message-Id: <1384877267-32046-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 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.3 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 From kmemleak: hex dump (first 32 bytes): 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [] kmemleak_alloc+0x26/0x50 [] kmem_cache_alloc+0x114/0x200 [] sysfs_new_dirent+0x51/0x130 [] create_dir+0x42/0xd0 [] sysfs_create_subdir+0x1f/0x30 [] internal_create_group+0x5e/0x270 [] sysfs_create_group+0x13/0x20 [] btrfs_sysfs_add_one+0x7e/0x280 [btrfs] [] open_ctree+0x17d2/0x21f0 [btrfs] [] btrfs_mount+0x53a/0x7d0 [btrfs] [] mount_fs+0x43/0x1b0 [] vfs_kern_mount+0x76/0x120 [] do_mount+0x237/0xa70 [] SyS_mount+0x90/0xe0 [] system_call_fastpath+0x16/0x1b [] 0xffffffffffffffff unreferenced object 0xffff8804e37d45b8 (size 160): Signed-off-by: Filipe David Borba Manana Signed-off-by: Jeff Mahoney --- fs/btrfs/sysfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 669fdf7..9576771 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -424,6 +424,8 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info) kobject_put(fs_info->device_dir_kobj); kobject_del(fs_info->space_info_kobj); kobject_put(fs_info->space_info_kobj); + sysfs_remove_group(&fs_info->super_kobj, + &btrfs_feature_attr_group); kobject_del(&fs_info->super_kobj); kobject_put(&fs_info->super_kobj); wait_for_completion(&fs_info->kobj_unregister);