From mboxrd@z Thu Jan 1 00:00:00 1970 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 E0B6A1A6816; Sat, 12 Sep 2026 19:13:32 +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=1789240414; cv=none; b=tqJ/rBOnSjNoFhnfvIGxYukhx0CYZx8TpHMXaYGOD1TGzjrUgT1olKTSbNtWeDuVmDfkvMa/gmSy6YjDv/46Nr+0c2+R8Hvod8yS7cQYimjXNnKL0Cv8SeUPpEZXxTivIXavDd2xeRBuPGWy19ogsMzgy8+qpPl/8LzxIC99MSM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789240414; c=relaxed/simple; bh=bYjkGCaqfD1onqIMMlVkgVCy1tsLFa4e5MBQL6B95ac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IEFHkfGIlGyg960vDRsUsmqoqy0cNnaDnkwNGwnLuJURxnTxtn2e+ztgFD1mIw6PX6FwqWxLwRXML3a2r5AgmDEb6BePsqUUH+60zElgV+7L2R050jS27f5vaHZOt0gUzgWdzUBcexGlVLizku+K4HK36kQZBAy+ajjezJcvACY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GmEaV2Kj; 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="GmEaV2Kj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0C441F000FF; Sat, 12 Sep 2026 19:13:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789240412; bh=Ml+nDRiHuNVHmlcDbMiTnePQ6TW+8dWllkCyrpEAGp4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GmEaV2Kj8kp2Z6iMRov0DprhQnQm4L6AENch6IkeVduuXDfGr9JSKA92WzJpFgmlY awh5HPm4bBc08OIewfLyGacyL0/qihV1rBSldgsJ8LtZwaw6CpEwUS8ZuBtZsFGAOs tTdaiOPMu2/lg/il0d/U4tDeA8A/IUI9fR2jBPzs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Chen , Andrii Nakryiko , Sasha Levin Subject: [PATCH 5.15 820/935] bpftool: Fix double close in map dump Date: Sat, 12 Sep 2026 09:04:10 +0200 Message-ID: <20260912065545.636760541@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065526.833703348@linuxfoundation.org> References: <20260912065526.833703348@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuan Chen [ Upstream commit 259d60f5bfa41056fe01cbf2ba3f6f0331865a16 ] map_dump() closes the map fd in its error path, and do_dump() then closes the same fd again after a successful dump. Closing an already closed fd leaves errno set to EBADF, which poisons later errno checks such as the batch file read check in do_batch(). Let do_dump() own the fd and remove the close from map_dump(). The same double-close pattern exists in do_show_subset(): both show_map_close_json() and show_map_close_plain() already close the fd, so drop the extra close() there as well. Also propagate the error when bpf_map_get_info_by_fd() fails on a subsequent map in do_dump(): set err = -1 before breaking out of the loop, so a later failure is not silently hidden after an earlier iteration succeeded. Fixes: 99f9863a0c45f ("bpftool: Match maps by name") Signed-off-by: Yuan Chen Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20260810142224.2907373-2-chenyuan_fl@163.com Signed-off-by: Sasha Levin --- tools/bpf/bpftool/map.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index 9575cb555e2cf..cf257da201951 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -674,8 +674,6 @@ static int do_show_subset(int argc, char **argv) show_map_close_json(fds[i], &info); else show_map_close_plain(fds[i], &info); - - close(fds[i]); } if (json_output && nb_fds > 1) jsonw_end_array(json_wtr); /* root array */ @@ -899,7 +897,6 @@ map_dump(int fd, struct bpf_map_info *info, json_writer_t *wtr, exit_free: free(key); free(value); - close(fd); free_map_kv_btf(btf); return err; @@ -948,6 +945,7 @@ static int do_dump(int argc, char **argv) for (i = 0; i < nb_fds; i++) { if (bpf_obj_get_info_by_fd(fds[i], &info, &len)) { p_err("can't get map info: %s", strerror(errno)); + err = -1; break; } err = map_dump(fds[i], &info, wtr, nb_fds > 1); -- 2.53.0