Changeset 268914 in webkit

Timestamp:

Oct 23, 2020, 1:26:00 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r268472 - [GLIB] Fix linking error for systems not providing <sys/memfd.h>
​https://bugs.webkit.org/show_bug.cgi?id=217514

Reviewed by Carlos Garcia Campos.

• UIProcess/Launcher/glib/BubblewrapLauncher.cpp: Unconditionally check for <sys/mman.h> which should always exist instead

of <sys/memfd.h>. Also define the fallback with syscall() only for linux systems (as it requires <linux/memfd.h>).

Location:

releases/WebKitGTK/webkit-2.30/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/glib/BubblewrapLauncher.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-14  Sergio Villar Senin  <svillar@igalia.com>
+
+        [GLIB] Fix linking error for systems not providing <sys/memfd.h>
+        https://bugs.webkit.org/show_bug.cgi?id=217514
+
+        Reviewed by Carlos Garcia Campos.
+
+        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp: Unconditionally check for <sys/mman.h> which should always exist instead
+        of <sys/memfd.h>. Also define the fallback with syscall() only for linux systems (as it requires <linux/memfd.h>).
+
 2020-10-15  Chris Lord  <clord@igalia.com>
 

releases/WebKitGTK/webkit-2.30/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

@@ -41 +41 @@
 #endif
 
-#if __has_include(<sys/memfd.h>)
-
-#include <sys/memfd.h>
-
-#else
+#include <sys/mman.h>
+
+#ifndef MFD_ALLOW_SEALING
+
+#if HAVE(LINUX_MEMFD_H)
+
+#include <linux/memfd.h>
 
 // These defines were added in glibc 2.27, the same release that added memfd_create.
@@ -60 +62 @@
 #define F_SEAL_WRITE  0x0008
 
-#define MFD_ALLOW_SEALING 2U
-
 static int memfd_create(const char* name, unsigned flags)
 {
     return syscall(__NR_memfd_create, name, flags);
 }
-#endif
+#endif // #if HAVE(LINUX_MEMFD_H)
+
+#endif // #ifndef MFD_ALLOW_SEALING
 
 namespace WebKit {