Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3083273ybj; Mon, 23 Sep 2019 14:31:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5CPS5UT7kbzIcLEQUm8G4HsnrPbup/RJI35/YVn2+KmOtFH7l37x/QRFCCZ2S/YDcdVWp X-Received: by 2002:a50:934c:: with SMTP id n12mr2388659eda.12.1569274298020; Mon, 23 Sep 2019 14:31:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569274298; cv=none; d=google.com; s=arc-20160816; b=eJu6T3IJBLFEttfC+C9a0cXfbrD6V0N0GnamZwpMsqchh3R4eQD1q4N55ZsV+UAhrr N6Qu0C8Yg18sTbWPIODyAqnW5xhDOUSas73joOr1O92xhABDOSwg2JtUDdqyRrQclV9V rWMFJxrQEPYCU7SQCPKfetYGz7KvrO6diKHvHPSYCuhTlPrEm8PilsQPPfwiVRCtnpZ3 aY8r+r59d/U1MBk4VuH1ePzN1uyiKqBHsWM2gMAC+7exXjkfO+wYzNb+nX6aIaVLu1BK rzAzFVc2UdMtO/SE5hrkRYngofQWjqSDwUCmxhwq4A3Sc/OY1t8ljEAByOyJsLg/W1cM KJ8Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=JzaD0amx4oPb44Xt5vQshaufIZNHPTu1p9gfPuSnETA=; b=qeCVqiPntQhzG4a78N8zSq2cMfjXtBaFcO/+nxwABjztZrCAIty6+Vdy+fmD3sNuZV V4RgkJ4SLk871Rr18N6uCZq6stOd+09exoKrtME87q7hFM7jMxpDj6rpTTx8pzlGXnPj +b1N70f7U9Na8qyUyswHxrcqNxcM/1cBknwRwWuXi1GTljci5sKmVHx4qQ+BNxFbISas 1yNSc/mehhyCSkHd6gKrN9810z3btonhygIhXiKj/zzyworRDsCneKT/roeAz2neDGvN nppArx8KqyR7KPbzInuS/G6KEuSfLwANyn2GAxsZMjXvUSnuu9vHber+jXGCtElN1SgA I4+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="gNxD/qCH"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ch10si5579342ejb.89.2019.09.23.14.31.14; Mon, 23 Sep 2019 14:31:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="gNxD/qCH"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390053AbfIVSqe (ORCPT + 99 others); Sun, 22 Sep 2019 14:46:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:42514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389931AbfIVSq0 (ORCPT ); Sun, 22 Sep 2019 14:46:26 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AAD720830; Sun, 22 Sep 2019 18:46:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177985; bh=hSOnlNHgMmVVWoFTLPvhL+Kt+46qjHL1MEcfw3YPfwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gNxD/qCHq+a5Ld3b687hsaRruH5EkVEHj0OyC+JuP550V/J7qVKC7G0RRInOF97Bn zdtZzrKGrcDHjYQFdY6M4JmKsZzt4iRd5oCit5zTIv/Qz/B5khu11CnZFMrdYnKn1z IiLDgJ1VtypzPql8m+2kKBrP9P314wzFssVLjNiQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Igor Lubashev , Jiri Olsa , Alexander Shishkin , Alexey Budankov , James Morris , Mathieu Poirier , Namhyung Kim , Peter Zijlstra , Suzuki Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 5.3 079/203] perf ftrace: Use CAP_SYS_ADMIN instead of euid==0 Date: Sun, 22 Sep 2019 14:41:45 -0400 Message-Id: <20190922184350.30563-79-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Igor Lubashev [ Upstream commit c766f3df635de14295e410c6dd5410bc416c24a0 ] The kernel requires CAP_SYS_ADMIN instead of euid==0 to mount debugfs for ftrace. Make perf do the same. Signed-off-by: Igor Lubashev Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Alexey Budankov Cc: James Morris Cc: Mathieu Poirier Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Suzuki Poulouse Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/bd8763b72ed4d58d0b42d44fbc7eb474d32e53a3.1565188228.git.ilubashe@akamai.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-ftrace.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c index 0193128104056..10971255fd2dc 100644 --- a/tools/perf/builtin-ftrace.c +++ b/tools/perf/builtin-ftrace.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "debug.h" #include @@ -21,6 +22,7 @@ #include "target.h" #include "cpumap.h" #include "thread_map.h" +#include "util/cap.h" #include "util/config.h" @@ -281,7 +283,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv) .events = POLLIN, }; - if (geteuid() != 0) { + if (!perf_cap__capable(CAP_SYS_ADMIN)) { pr_err("ftrace only works for root!\n"); return -1; } -- 2.20.1