Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Raptor Engineering Public Development
Chromium
OpenPOWER Patches
Commits
32d0d871
Commit
32d0d871
authored
7 months ago
by
Timothy Pearson
Browse files
Options
Download
Email Patches
Plain Diff
Fix inadvertent regression introduced during patch update
parent
ef4c5558
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
patches/ppc64le/sandbox/0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch
...inux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch
+6
-6
No files found.
patches/ppc64le/sandbox/0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch
View file @
32d0d871
...
...
@@ -10,10 +10,10 @@ More investigation required.
sandbox/linux/seccomp-bpf/trap.cc | 14 ++++++++++++++
1 file changed, 14 insertions(+)
Index: chromium-12
7
.0.6
533.88
/sandbox/linux/seccomp-bpf/trap.cc
Index: chromium-12
6
.0.6
478.57
/sandbox/linux/seccomp-bpf/trap.cc
===================================================================
--- chromium-12
7
.0.6
533.88
.orig/sandbox/linux/seccomp-bpf/trap.cc
+++ chromium-12
7
.0.6
533.88
/sandbox/linux/seccomp-bpf/trap.cc
--- chromium-12
6
.0.6
478.57
.orig/sandbox/linux/seccomp-bpf/trap.cc
+++ chromium-12
6
.0.6
478.57
/sandbox/linux/seccomp-bpf/trap.cc
@@ -231,6 +231,20 @@
void Trap::SigSys(int nr, LinuxSigInfo*
SetIsInSigHandler();
}
...
...
@@ -23,9 +23,9 @@ Index: chromium-127.0.6533.88/sandbox/linux/seccomp-bpf/trap.cc
+ // parameter which causes checks against it to fail. For now, manually
+ // negate them back.
+ // TODO(shawn@anastas.io): investigate this issue further
+ auto nr = SECCOMP_SYSCALL(ctx);
+ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
+ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
+ auto
c
nr = SECCOMP_SYSCALL(ctx);
+ if (
c
nr == __NR_openat ||
c
nr == __NR_mkdirat ||
c
nr == __NR_faccessat ||
c
nr == __NR_readlinkat ||
+
c
nr == __NR_renameat ||
c
nr == __NR_renameat2 ||
c
nr == __NR_newfstatat ||
c
nr == __NR_unlinkat) {
+ if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
+ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
+ }
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment