From patchwork Tue Jun 23 19:55:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191551 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2299916ile; Tue, 23 Jun 2020 13:16:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+XJv2QJvAVig/yfBzphqr6Di0MS5bWZkg3865+l9GwrZMGWQY+aHaYfvDA+mZevdIGlMR X-Received: by 2002:a50:f702:: with SMTP id g2mr7873483edn.348.1592943363016; Tue, 23 Jun 2020 13:16:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592943363; cv=none; d=google.com; s=arc-20160816; b=k7s11qeZbLni4QcNII+NhHPxvCwtzTUjBxD8ENyTWxNosvkzoAz19wlVBytn7w/FSM X/BELAA0Ur/16Rt7S2+zy6NHhnb0kNMl515hAOIuQkIty972QXRhPmn91Uin0C3utPOz Ko4YHIvI0WzEN/Y7hPq29gFbSIPkV9lMQolVhcqtlRmA+2Hz8+9fxLgeOXFSCFe3DlSC DhozMKVqLkHqujnzY7E3u7wL8HHpd66uRHglKIN3FdqA0LAEgC2ZWiU6caCsTHb7P+Zs kAdRAYXCkiDNh4SMYjGeSMXgNUM610300Yz3hrx2XxthkEcI3qvSCEWJ0GxCKsTQkNU/ s8IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Xuu9MnBVAlsVfXVyJt9IKqgxbvv6vPeH3SFlThLegEY=; b=nyvvUxIV6WaExb6xOMJTYZYu+rkg9Gl8AFGVdx4FV5IlMmasNgx5vUgZ++V5yu6vkk hC/L3W8N9ZlsZEo19fyVOEhPTK5F5FODCWUHNEiTRjDXSAOEk5y9bznRBstfRoLcAkqQ Lz/3O8jlwMhnR5bck2lb3TsKhqgv3c02N/tUEy5/4hypzLrA4k7A7AoJrOrWmjml7ZTX LxTBaE+3dDZak8arxRtYkSRrS/Vq0TrDyrc4SFv/f5mLVYVqSTGTr2VgmXsFrH60804M VGHmo2raufZSCFvdM5JRMO4lkpn/udwxk5Hhm/5CfpSR4XGjjbn8d7OgkafPhjPu9UZa 3shg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZZwiUJpK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d2si11231818ejw.702.2020.06.23.13.16.02; Tue, 23 Jun 2020 13:16:03 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZZwiUJpK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388441AbgFWUQA (ORCPT + 15 others); Tue, 23 Jun 2020 16:16:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:59232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388901AbgFWUP7 (ORCPT ); Tue, 23 Jun 2020 16:15:59 -0400 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 DF31C20702; Tue, 23 Jun 2020 20:15:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943359; bh=CoUWkoNza6UN9/1kLJu/JmxiUJyTQiCu0L4g1FUCvCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZZwiUJpKJzEOCQjxMr5216/ElI6mmX31CLkmYfcYRsJXMrWLzgvIH02yQpGKj5omL MqNTEJotuZgh9NKVyAngEFoZHRy+5aAqG/ivDh87rmTUcVxv1N9aDuFYaNrOC4ik4F Skv56ZjaRb9iHZ2degz1eusH18L2lmD20K6rAuNI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jean-Philippe Brucker , Alexei Starovoitov , Yonghong Song , Masami Hiramatsu , Sasha Levin Subject: [PATCH 5.7 361/477] tracing/probe: Fix bpf_task_fd_query() for kprobes and uprobes Date: Tue, 23 Jun 2020 21:55:58 +0200 Message-Id: <20200623195424.595608159@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jean-Philippe Brucker [ Upstream commit 22d5bd6867364b41576a712755271a7d6161abd6 ] Commit 60d53e2c3b75 ("tracing/probe: Split trace_event related data from trace_probe") removed the trace_[ku]probe structure from the trace_event_call->data pointer. As bpf_get_[ku]probe_info() were forgotten in that change, fix them now. These functions are currently only used by the bpf_task_fd_query() syscall handler to collect information about a perf event. Fixes: 60d53e2c3b75 ("tracing/probe: Split trace_event related data from trace_probe") Signed-off-by: Jean-Philippe Brucker Signed-off-by: Alexei Starovoitov Acked-by: Yonghong Song Acked-by: Masami Hiramatsu Link: https://lore.kernel.org/bpf/20200608124531.819838-1-jean-philippe@linaro.org Signed-off-by: Sasha Levin --- kernel/trace/trace_kprobe.c | 2 +- kernel/trace/trace_uprobe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 35989383ae113..8eeb95e04bf52 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1629,7 +1629,7 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type, if (perf_type_tracepoint) tk = find_trace_kprobe(pevent, group); else - tk = event->tp_event->data; + tk = trace_kprobe_primary_from_call(event->tp_event); if (!tk) return -EINVAL; diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 2a8e8e9c1c754..fdd47f99b18fd 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -1412,7 +1412,7 @@ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type, if (perf_type_tracepoint) tu = find_probe_event(pevent, group); else - tu = event->tp_event->data; + tu = trace_uprobe_primary_from_call(event->tp_event); if (!tu) return -EINVAL;