Title: [265737] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 265737
- Author
- [email protected]
- Date
- 2020-08-15 13:26:09 -0700 (Sat, 15 Aug 2020)
Log Message
Merged r265326 - [WPE][GTK] Wrong argument order for clone syscall seccomp filter on s390x
https://bugs.webkit.org/show_bug.cgi?id=215212
Reviewed by Michael Catanzaro.
Patch based on this Flatpak pull request:
https://github.com/flatpak/flatpak/pull/3777
No new tests needed.
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
(WebKit::setupSeccomp): Add preprocessor guard to choose the correct
clone() system call argument on S390.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (265736 => 265737)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-08-15 20:25:55 UTC (rev 265736)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-08-15 20:26:09 UTC (rev 265737)
@@ -1,3 +1,19 @@
+2020-08-06 Adrian Perez de Castro <[email protected]>
+
+ [WPE][GTK] Wrong argument order for clone syscall seccomp filter on s390x
+ https://bugs.webkit.org/show_bug.cgi?id=215212
+
+ Reviewed by Michael Catanzaro.
+
+ Patch based on this Flatpak pull request:
+ https://github.com/flatpak/flatpak/pull/3777
+
+ No new tests needed.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::setupSeccomp): Add preprocessor guard to choose the correct
+ clone() system call argument on S390.
+
2020-07-28 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.28.4 release
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (265736 => 265737)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-08-15 20:25:55 UTC (rev 265736)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2020-08-15 20:26:09 UTC (rev 265737)
@@ -586,7 +586,16 @@
// in common/flatpak-run.c
// https://git.gnome.org/browse/linux-user-chroot
// in src/setup-seccomp.c
+
+#if defined(__s390__) || defined(__s390x__) || defined(__CRIS__)
+ // Architectures with CONFIG_CLONE_BACKWARDS2: the child stack
+ // and flags arguments are reversed so the flags come second.
+ struct scmp_arg_cmp cloneArg = SCMP_A1(SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER);
+#else
+ // Normally the flags come first.
struct scmp_arg_cmp cloneArg = SCMP_A0(SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER);
+#endif
+
struct scmp_arg_cmp ttyArg = SCMP_A1(SCMP_CMP_MASKED_EQ, 0xFFFFFFFFu, TIOCSTI);
struct {
int scall;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
