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 A794A15C82 for ; Mon, 5 Dec 2022 19:23:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AFBFC433C1; Mon, 5 Dec 2022 19:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1670268194; bh=PBF8roq2s4eVgfA4poNqbM0zOD4uvA+mV6O7Vz9eV0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BGOO14L5OLZzjw5fOqss27G5Sjqkrh+C/Y8+q4wezlyrQoDQzqIiV5619PcioTRUN Ni3InlYqooFAB8tASs5Ep1hk8N91aLDQ8qX4+NJ3w6AueAsFMKhoQAhhCH1sZesA+E LJ2iQ/PhaPLB1S679U1L8jYIix0V5hfeZQJym7Ko= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiri Olsa , Andrii Nakryiko , Sasha Levin Subject: [PATCH 6.0 015/124] libbpf: Use correct return pointer in attach_raw_tp Date: Mon, 5 Dec 2022 20:08:41 +0100 Message-Id: <20221205190808.880271477@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221205190808.422385173@linuxfoundation.org> References: <20221205190808.422385173@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Jiri Olsa [ Upstream commit 5fd2a60aecf3a42b14fa371c55b3dbb18b229230 ] We need to pass '*link' to final libbpf_get_error, because that one holds the return value, not 'link'. Fixes: 4fa5bcfe07f7 ("libbpf: Allow BPF program auto-attach handlers to bail out") Signed-off-by: Jiri Olsa Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20221114145257.882322-1-jolsa@kernel.org Signed-off-by: Sasha Levin --- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index e36c44090720..79ea83be21ce 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -11143,7 +11143,7 @@ static int attach_raw_tp(const struct bpf_program *prog, long cookie, struct bpf } *link = bpf_program__attach_raw_tracepoint(prog, tp_name); - return libbpf_get_error(link); + return libbpf_get_error(*link); } /* Common logic for all BPF program types that attach to a btf_id */ -- 2.35.1