From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36ABF21018A for ; Fri, 15 May 2026 14:48:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778856504; cv=none; b=BGP6kcA6C7qFTzw3M11SB7D/ZHZRb1bXhswKZHYrAz0+CgPe99awBMDBiXalVcVJtPkqJ/G8R/09M1fKFF1RYxUvSIzNYpfA9EWrNl9ehoUFqmGQnlDdGd5Vu40a5BN6yuZCL8yoGIu64jGkzhaOzlj4N51rwkqrR2esRfVwU5g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778856504; c=relaxed/simple; bh=gQS/aYgaU93bNBA1dgvJCSB87R9Reg2JGCSThceKCRw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=prstweseRamEmArBFlZ4IzFGIJEUjoXq+bFC6wZASzAxZBed3Qv8xn3hM7IIh5XSbxYvsQzbfC4bQlXqMoSQqVDA6q8rys//Y2uESzpW7fcgCAovFeupVFOtLW8CnBiPPmLdlXSOTn+ZcCsOh4tCNtsUkOc72uh+IpYm1fEHBbE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QT3EVbqN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QT3EVbqN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B91FC2BCB8; Fri, 15 May 2026 14:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778856503; bh=gQS/aYgaU93bNBA1dgvJCSB87R9Reg2JGCSThceKCRw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QT3EVbqNtnWZE7qGtaQb/8Z8NonWCBs/zEB4zSWs7s+RLqyRHbW4qqosb3uduLWFt /QvQ1Qb6FNZzN4C86Swvf5N9uFRFYAXwSGE0X98+v6hlOXPIRvoO9Z/lwrPSoJVRqE oSiBxdjXyNoOPOJa++IZbHMTrl85Swooa65EKKlOx/h1M0iMD0A/8GM6MV3EE07ZeC 1lBuZ3lBV1q++EY6Bf4bsprD+/3OrsR/j2OCziQM3STsKGgRG21uQohgQD5RR3Z5Io ofx+l+X4T2IVbhiwRMZPiaNjSjFSc/InPjIj8+6/ayrlr5EXp9TiQbLdkc488xwwIw fEh+c8VpZ8QRA== From: Sasha Levin To: stable@vger.kernel.org Cc: Guangshuo Li , Qu Wenruo , David Sterba , Sasha Levin Subject: [PATCH 6.6.y 2/2] btrfs: fix double free in create_space_info_sub_group() error path Date: Fri, 15 May 2026 10:48:20 -0400 Message-ID: <20260515144820.3248893-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515144820.3248893-1-sashal@kernel.org> References: <2026051235-front-pushup-165a@gregkh> <20260515144820.3248893-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Guangshuo Li [ Upstream commit a7449edf96143f192606ec8647e3167e1ecbd728 ] When kobject_init_and_add() fails, the call chain is: create_space_info_sub_group() -> btrfs_sysfs_add_space_info_type() -> kobject_init_and_add() -> failure -> kobject_put(&sub_group->kobj) -> space_info_release() -> kfree(sub_group) Then control returns to create_space_info_sub_group(), where: btrfs_sysfs_add_space_info_type() returns error -> kfree(sub_group) Thus, sub_group is freed twice. Keep parent->sub_group[index] = NULL for the failure path, but after btrfs_sysfs_add_space_info_type() has called kobject_put(), let the kobject release callback handle the cleanup. Fixes: f92ee31e031c ("btrfs: introduce btrfs_space_info sub-group") CC: stable@vger.kernel.org # 6.18+ Reviewed-by: Qu Wenruo Signed-off-by: Guangshuo Li Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/space-info.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c index 292789a1b84b9..8fe35fd82912e 100644 --- a/fs/btrfs/space-info.c +++ b/fs/btrfs/space-info.c @@ -263,10 +263,8 @@ static int create_space_info_sub_group(struct btrfs_space_info *parent, u64 flag sub_group->subgroup_id = id; ret = btrfs_sysfs_add_space_info_type(sub_group); - if (ret) { - kfree(sub_group); + if (ret) parent->sub_group[index] = NULL; - } return ret; } -- 2.53.0