diff options
| author | Stefan Kangas | 2022-03-06 06:32:23 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2022-03-06 06:32:23 +0100 |
| commit | 200627c255c4bf3f050f7f75fb3e4e100fe97bfa (patch) | |
| tree | bd7f448f390abdaeda2ecd00d4158fd0abc8df2e /lib-src | |
| parent | e09bbfc37d81d58af3412ae1b56dc2e620218653 (diff) | |
| parent | 0090318c6113828688e84fc50a13a8d9c5f71c55 (diff) | |
| download | emacs-200627c255c4bf3f050f7f75fb3e4e100fe97bfa.tar.gz emacs-200627c255c4bf3f050f7f75fb3e4e100fe97bfa.zip | |
Merge from origin/emacs-28
0090318c61 * lib-src/seccomp-filter.c (main): Use faccessat2 only if ...
3bb01a499b Fix regression in derived-mode-init-mode-variables
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/seccomp-filter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib-src/seccomp-filter.c b/lib-src/seccomp-filter.c index d368cbb46c8..b5158510104 100644 --- a/lib-src/seccomp-filter.c +++ b/lib-src/seccomp-filter.c | |||
| @@ -240,7 +240,9 @@ main (int argc, char **argv) | |||
| 240 | should be further restricted using mount namespaces. */ | 240 | should be further restricted using mount namespaces. */ |
| 241 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (access)); | 241 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (access)); |
| 242 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat)); | 242 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat)); |
| 243 | #ifdef __NR_faccessat2 | ||
| 243 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat2)); | 244 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat2)); |
| 245 | #endif | ||
| 244 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat)); | 246 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat)); |
| 245 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat64)); | 247 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat64)); |
| 246 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (lstat)); | 248 | RULE (SCMP_ACT_ALLOW, SCMP_SYS (lstat)); |