From: "tip-bot2 for Igor Lubashev" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Igor Lubashev <ilubashe@akamai.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Alexey Budankov <alexey.budankov@linux.intel.com>,
James Morris <jmorris@namei.org>, Jiri Olsa <jolsa@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Suzuki Poulouse <suzuki.poulose@arm.com>,
linux-arm-kernel@lists.infradead.org,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Ingo Molnar <mingo@kernel.org>, Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: perf/core] perf symbols: Use CAP_SYSLOG with kptr_restrict checks
Date: Thu, 29 Aug 2019 19:01:47 -0000 [thread overview]
Message-ID: <156710530783.10520.13944020347498949771.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1566869956-7154-5-git-send-email-ilubashe@akamai.com>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 8859aedefefe7eeea5e67968b7fe39c828d589a0
Gitweb: https://git.kernel.org/tip/8859aedefefe7eeea5e67968b7fe39c828d589a0
Author: Igor Lubashev <ilubashe@akamai.com>
AuthorDate: Mon, 26 Aug 2019 21:39:15 -04:00
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Wed, 28 Aug 2019 17:19:19 -03:00
perf symbols: Use CAP_SYSLOG with kptr_restrict checks
The kernel is using CAP_SYSLOG capability instead of uid==0 and euid==0
when checking kptr_restrict. Make perf do the same.
Also, the kernel is a more restrictive than "no restrictions" in case of
kptr_restrict==0, so add the same logic to perf.
Signed-off-by: Igor Lubashev <ilubashe@akamai.com>
Tested-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: James Morris <jmorris@namei.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/1566869956-7154-5-git-send-email-ilubashe@akamai.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/symbol.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 4efde78..035f2e7 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -4,6 +4,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <linux/capability.h>
#include <linux/kernel.h>
#include <linux/mman.h>
#include <linux/time64.h>
@@ -15,8 +16,10 @@
#include <inttypes.h>
#include "annotate.h"
#include "build-id.h"
+#include "cap.h"
#include "util.h"
#include "debug.h"
+#include "event.h"
#include "machine.h"
#include "map.h"
#include "symbol.h"
@@ -2195,13 +2198,19 @@ static bool symbol__read_kptr_restrict(void)
char line[8];
if (fgets(line, sizeof(line), fp) != NULL)
- value = ((geteuid() != 0) || (getuid() != 0)) ?
- (atoi(line) != 0) :
- (atoi(line) == 2);
+ value = perf_cap__capable(CAP_SYSLOG) ?
+ (atoi(line) >= 2) :
+ (atoi(line) != 0);
fclose(fp);
}
+ /* Per kernel/kallsyms.c:
+ * we also restrict when perf_event_paranoid > 1 w/o CAP_SYSLOG
+ */
+ if (perf_event_paranoid() > 1 && !perf_cap__capable(CAP_SYSLOG))
+ value = true;
+
return value;
}
next prev parent reply other threads:[~2019-08-29 19:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 1:39 [PATCH 0/5] perf: Treat perf_event_paranoid and kptr_restrict like the kernel does it Igor Lubashev
2019-08-27 1:39 ` [PATCH 1/5] perf event: Check ref_reloc_sym before using it Igor Lubashev
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Igor Lubashev
2019-08-27 1:39 ` [PATCH 2/5] perf tools: Use CAP_SYS_ADMIN with perf_event_paranoid checks Igor Lubashev
2019-08-29 19:01 ` [tip: perf/core] " tip-bot2 for Igor Lubashev
2019-08-27 1:39 ` [PATCH 3/5] perf util: kernel profiling is disallowed only when perf_event_paranoid > 1 Igor Lubashev
2019-08-27 13:44 ` Arnaldo Carvalho de Melo
2019-08-29 19:01 ` [tip: perf/core] perf evsel: Kernel " tip-bot2 for Igor Lubashev
2019-08-27 1:39 ` [PATCH 4/5] perf symbols: Use CAP_SYSLOG with kptr_restrict checks Igor Lubashev
2019-08-29 19:01 ` tip-bot2 for Igor Lubashev [this message]
2019-08-27 1:39 ` [PATCH 5/5] perf: warn that perf_event_paranoid can restrict kernel symbols Igor Lubashev
2019-08-29 19:01 ` [tip: perf/core] perf tools: Warn " tip-bot2 for Igor Lubashev
2019-08-28 19:31 ` [PATCH 0/5] perf: Treat perf_event_paranoid and kptr_restrict like the kernel does it Mathieu Poirier
2019-08-28 20:22 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=156710530783.10520.13944020347498949771.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=bp@alien8.de \
--cc=ilubashe@akamai.com \
--cc=jmorris@namei.org \
--cc=jolsa@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=suzuki.poulose@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®