From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91702C2D0DA for ; Sun, 29 Dec 2019 18:04:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BC8320718 for ; Sun, 29 Dec 2019 18:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642675; bh=n9CkyqIfMjvOX9Wn6eD95kEzQOCgGZNhlpsHpCAheo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Fm7g3KiLFBGBqarmheu7xNWtdNPxHb1d7o7GEBo0GwXGOhAP6qKNvrqdkj8EckYBd FnPDfpVx2BRac1Q4D7OHn+pkebv+xyswwfnT3me3zeo1ZkRnD3AltyIJ6NnRrs2T01 5gS5/ztsUZV738HvNkJxQ8SbfOTOFIonrV+DGv5c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732208AbfL2RwF (ORCPT ); Sun, 29 Dec 2019 12:52:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:37992 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732206AbfL2RwD (ORCPT ); Sun, 29 Dec 2019 12:52:03 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0CAAD206A4; Sun, 29 Dec 2019 17:52:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641923; bh=n9CkyqIfMjvOX9Wn6eD95kEzQOCgGZNhlpsHpCAheo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2LgV24GrZZLSXqbo/gQo2OMqN/M5SdhOOeyEKLgaJFwJrjD7TYjHa2AZlvV04nId5 Twnp9mVeZxvSKGKWQij5jNWX1VbfXDvm6QM/uqP/MB5Hj8gjiDO2nT9OrpJ7PdXiFT NymzFSgjzDFEGzZWfPpXogqqiVFas4GQsgQxg4Eo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrii Nakryiko , Daniel Borkmann , Sasha Levin Subject: [PATCH 5.4 267/434] libbpf: Fix negative FD close() in xsk_setup_xdp_prog() Date: Sun, 29 Dec 2019 18:25:20 +0100 Message-Id: <20191229172719.673306275@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrii Nakryiko [ Upstream commit 9656b346b280c3e49c8a116c3a715f966633b161 ] Fix issue reported by static analysis (Coverity). If bpf_prog_get_fd_by_id() fails, xsk_lookup_bpf_maps() will fail as well and clean-up code will attempt close() with fd=-1. Fix by checking bpf_prog_get_fd_by_id() return result and exiting early. Fixes: 10a13bb40e54 ("libbpf: remove qidconf and better support external bpf programs.") Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20191107054059.313884-1-andriin@fb.com Signed-off-by: Sasha Levin --- tools/lib/bpf/xsk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index 9d5348086203..a73b79d29333 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -466,6 +466,8 @@ static int xsk_setup_xdp_prog(struct xsk_socket *xsk) } } else { xsk->prog_fd = bpf_prog_get_fd_by_id(prog_id); + if (xsk->prog_fd < 0) + return -errno; err = xsk_lookup_bpf_maps(xsk); if (err) { close(xsk->prog_fd); -- 2.20.1