linux-kernel - Re: [PATCH v1] perf cap: Add __NR

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <Zx-2-GhdII3ZIizi@x1>
Date: Mon, 28 Oct 2024 13:08:24 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Adrian Hunter <adrian.hunter@...el.com>
Cc: Ian Rogers <irogers@...gle.com>, Peter Zijlstra <peterz@...radead.org>,
	Ingo Molnar <mingo@...hat.com>, Namhyung Kim <namhyung@...nel.org>,
	Mark Rutland <mark.rutland@....com>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
	Jiri Olsa <jolsa@...nel.org>, Kan Liang <kan.liang@...ux.intel.com>,
	linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org
Subject: Re: [PATCH v1] perf cap: Add __NR_capget to arch/x86 unistd

On Mon, Oct 28, 2024 at 09:25:36AM +0200, Adrian Hunter wrote:
> On 26/10/24 09:00, Ian Rogers wrote:
> > On Fri, Oct 25, 2024 at 10:54 PM Ian Rogers <irogers@...gle.com> wrote:
> >>
> >> As there are duplicated kernel headers in tools/include libc can pick
> >> up the wrong definitions. This was causing the wrong system call for
> >> capget in perf.
> >>
> >> Closes: https://lore.kernel.org/lkml/cc7d6bdf-1aeb-4179-9029-4baf50b59342@intel.com/
> >> Signed-off-by: Ian Rogers <irogers@...gle.com>
> > 
> > Forgot:
> > Fixes: e25ebda78e23 ("perf cap: Tidy up and improve capability testing")
> 
> Works for me, thank you!
> 
> Tested-by: Adrian Hunter <adrian.hunter@...el.com>

Thanks, I also added this:

Reported-by: Adrian Hunter <adrian.hunter@...el.com>

Applied to perf-tools, for v6.12-rc.

- Arnaldo
 
> > 
> > Thanks,
> > Ian
> > 
> >> ---
> >>  tools/arch/x86/include/uapi/asm/unistd_32.h |  3 +++
> >>  tools/arch/x86/include/uapi/asm/unistd_64.h |  3 +++
> >>  tools/perf/util/cap.c                       | 10 +++-------
> >>  3 files changed, 9 insertions(+), 7 deletions(-)
> >>
> >> diff --git a/tools/arch/x86/include/uapi/asm/unistd_32.h b/tools/arch/x86/include/uapi/asm/unistd_32.h
> >> index 9de35df1afc3..63182a023e9d 100644
> >> --- a/tools/arch/x86/include/uapi/asm/unistd_32.h
> >> +++ b/tools/arch/x86/include/uapi/asm/unistd_32.h
> >> @@ -11,6 +11,9 @@
> >>  #ifndef __NR_getpgid
> >>  #define __NR_getpgid 132
> >>  #endif
> >> +#ifndef __NR_capget
> >> +#define __NR_capget 184
> >> +#endif
> >>  #ifndef __NR_gettid
> >>  #define __NR_gettid 224
> >>  #endif
> >> diff --git a/tools/arch/x86/include/uapi/asm/unistd_64.h b/tools/arch/x86/include/uapi/asm/unistd_64.h
> >> index d0f2043d7132..77311e8d1b5d 100644
> >> --- a/tools/arch/x86/include/uapi/asm/unistd_64.h
> >> +++ b/tools/arch/x86/include/uapi/asm/unistd_64.h
> >> @@ -11,6 +11,9 @@
> >>  #ifndef __NR_getpgid
> >>  #define __NR_getpgid 121
> >>  #endif
> >> +#ifndef __NR_capget
> >> +#define __NR_capget 125
> >> +#endif
> >>  #ifndef __NR_gettid
> >>  #define __NR_gettid 186
> >>  #endif
> >> diff --git a/tools/perf/util/cap.c b/tools/perf/util/cap.c
> >> index 7574a67651bc..69d9a2bcd40b 100644
> >> --- a/tools/perf/util/cap.c
> >> +++ b/tools/perf/util/cap.c
> >> @@ -7,13 +7,9 @@
> >>  #include "debug.h"
> >>  #include <errno.h>
> >>  #include <string.h>
> >> -#include <unistd.h>
> >>  #include <linux/capability.h>
> >>  #include <sys/syscall.h>
> >> -
> >> -#ifndef SYS_capget
> >> -#define SYS_capget 90
> >> -#endif
> >> +#include <unistd.h>
> >>
> >>  #define MAX_LINUX_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3
> >>
> >> @@ -21,9 +17,9 @@ bool perf_cap__capable(int cap, bool *used_root)
> >>  {
> >>         struct __user_cap_header_struct header = {
> >>                 .version = _LINUX_CAPABILITY_VERSION_3,
> >> -               .pid = getpid(),
> >> +               .pid = 0,
> >>         };
> >> -       struct __user_cap_data_struct data[MAX_LINUX_CAPABILITY_U32S];
> >> +       struct __user_cap_data_struct data[MAX_LINUX_CAPABILITY_U32S] = {};
> >>         __u32 cap_val;
> >>
> >>         *used_root = false;
> >> --
> >> 2.47.0.163.g1226f6d8fa-goog
> >>