Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 DA4093CC7F8; Thu, 17 Sep 2026 19:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789671784; cv=none; b=sQNUicJHch7FBfbtZ5Ot2TCTm+Tq0VzD21I1pb6QT2BGo3vK0SrYcl6vaKoaPwQz2j96yT6efZOXG+SvzR8vCTdz5iDT4vfpJum6biUtH8Nlw/lEb4X5dPMVCbizR2vs48X9lLSc5OByk/PYrmnNuxoRaDAsjdrIZ9hmQM05W7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789671784; c=relaxed/simple; bh=pfoEzrNsBrQNYkOLqTOUEo6WKnuOrgqV35YCgLLizV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EciPGDnM/sqGYc3VUDYU3X7oVlGz0RZInFQEA0+E33UOWFNyjZyC3STato3G/l3eLT0yLyuUjI60G/VqRkBStHe/k95n11D/NZ4IdRF6MlsNKPqwWsJm0elZHla4xH8hw2uoReNNf326aZrfzVgyw9XwMefYZDs2OT+4y2YPD08= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vqINzycs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vqINzycs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EDDC1F00893; Thu, 17 Sep 2026 19:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789671781; bh=QrJ9EytTs46oTRlI99ovWyR0b8FFm/FrQ1gpXEGaFqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vqINzycsnnHpJtWSxfDBldu/iYrjlhu3r6TuoGdrlN5BTLJp1q5bJohjO4BVmoHh+ shSKxNn+mbOZDAQguNFhkEQpHA8+SdW3hdxe0XtUMM+/U+tJHBg31U0DRyihPQdpRr C735HZRCv7FZ0qeLqaqVQEC/lKGeGzKN7tB3JAeY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qu Wenruo , Filipe Manana , Shuangpeng Bai , David Sterba , Sasha Levin Subject: [PATCH 6.12 1051/1102] btrfs: fix extent map leak in NOCOW direct I/O write Date: Thu, 17 Sep 2026 16:16:34 +0100 Message-ID: <20260917151607.193021749@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shuangpeng Bai [ Upstream commit 3f950867c307c5413d628a153ac44915bd117ffd ] btrfs_dio_iomap_begin() calls btrfs_get_extent(), which returns an extent map reference that must be dropped on all exit paths. For direct writes into a NOCOW range, btrfs_get_blocks_direct_write() keeps using that extent map and asks btrfs_create_dio_extent() to allocate the ordered extent. If that fails, for example because btrfs_alloc_ordered_extent() fails, the function returns the error without dropping the input extent map. The PREALLOC path avoided this by dropping the input extent map before replacing it with the newly created one. Check the error from btrfs_create_dio_extent() before replacing the map and drop the input extent map on failure. Fixes: 5f9a8a51d8b9 ("Btrfs: add semaphore to synchronize direct IO writes with fsync") CC: stable@vger.kernel.org Reviewed-by: Qu Wenruo Reviewed-by: Filipe Manana Signed-off-by: Shuangpeng Bai Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/direct-io.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) --- a/fs/btrfs/direct-io.c +++ b/fs/btrfs/direct-io.c @@ -280,17 +280,24 @@ static int btrfs_get_blocks_direct_write em2 = btrfs_create_dio_extent(BTRFS_I(inode), dio_data, start, &file_extent, type); btrfs_dec_nocow_writers(bg); - if (type == BTRFS_ORDERED_PREALLOC) { - btrfs_free_extent_map(em); - *map = em2; - em = em2; - } - if (IS_ERR(em2)) { ret = PTR_ERR(em2); + btrfs_free_extent_map(em); + *map = NULL; goto out; } + /* + * True NOCOW writes don't need to create a new extent map, + * while PREALLOC writes must replace the existing one. + */ + if (em2) { + ASSERT(type == BTRFS_ORDERED_PREALLOC); + btrfs_free_extent_map(em); + *map = em2; + em = em2; + } + dio_data->nocow_done = true; } else { /* Our caller expects us to free the input extent map. */