Changeset 227057 in webkit

Timestamp:

Jan 17, 2018 2:06:28 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Duplicated symbols in libjavascriptcoregtk and libwebkit2gtk can cause crashes in production builds
​https://bugs.webkit.org/show_bug.cgi?id=179914

Reviewed by Žan Doberšek.

Source/WebKit:

Add symbols detected by check-for-global-bss-symbols-in-webkigtk-libs to the version script.

• webkitglib-symbols.map:

Tools:

Add two scripts to be run by dist-check step when releasing. One is to detect symbols duplicated in
libjavascriptcoregtk and libwebkit2gtk that should be included to the version script. The other one is to ensure
all symbols listed in the script are present in the library.

• Scripts/check-for-global-bss-symbols-in-webkigtk-libs: Added.

(bss_symbols):

• Scripts/check-for-invalid-symbols-in-version-script: Added.

(script_symbols):

• Scripts/make-dist:

(Distcheck.build):
(Distcheck):
(Distcheck.check_symbols):
(Distcheck.check):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/webkitglib-symbols.map (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/check-for-global-bss-symbols-in-webkigtk-libs (added)
• Tools/Scripts/check-for-invalid-symbols-in-version-script (added)
• Tools/Scripts/make-dist (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Duplicated symbols in libjavascriptcoregtk and libwebkit2gtk can cause crashes in production builds
+        https://bugs.webkit.org/show_bug.cgi?id=179914
+
+        Reviewed by Žan Doberšek.
+
+        Add symbols detected by check-for-global-bss-symbols-in-webkigtk-libs to the version script.
+
+        * webkitglib-symbols.map:
+
 2018-01-17  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/webkitglib-symbols.map

@@ -7 +7 @@
   StorageProcessMainUnix;
   extern "C++" {
+    "bmalloc::PerProcess<bmalloc::IsoTLSDeallocatorEntry<bmalloc::IsoConfig<40u> > >::s_memory";
+    "bmalloc::PerProcess<bmalloc::IsoTLSDeallocatorEntry<bmalloc::IsoConfig<40u> > >::s_mutex";
+    "bmalloc::PerProcess<bmalloc::IsoTLSDeallocatorEntry<bmalloc::IsoConfig<40u> > >::s_object";
+    "bmalloc::PerProcess<bmalloc::Scavenger>::s_memory";
+    "bmalloc::PerProcess<bmalloc::Scavenger>::s_mutex";
+    "bmalloc::PerProcess<bmalloc::Scavenger>::s_object";
+    "bmalloc::vmPageSize()::cached";
+    "guard variable for bmalloc::PerProcess<bmalloc::IsoTLSDeallocatorEntry<bmalloc::IsoConfig<40u> > >::s_mutex";
+    "guard variable for bmalloc::PerProcess<bmalloc::IsoTLSDeallocatorEntry<bmalloc::IsoConfig<40u> > >::s_object";
+    "guard variable for bmalloc::PerProcess<bmalloc::PerHeapKind<bmalloc::Heap> >::s_mutex";
+    "guard variable for bmalloc::PerProcess<bmalloc::Scavenger>::s_mutex";
+    "guard variable for bmalloc::PerProcess<bmalloc::Scavenger>::s_object";
     "WebKit::WebKitExtensionManager::singleton()";
     "WebKit::WebKitExtensionManager::initialize(WebKit::InjectedBundle*, API::Object*)";

trunk/Tools/ChangeLog

@@ +1 @@
+2018-01-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Duplicated symbols in libjavascriptcoregtk and libwebkit2gtk can cause crashes in production builds
+        https://bugs.webkit.org/show_bug.cgi?id=179914
+
+        Reviewed by Žan Doberšek.
+
+        Add two scripts to be run by dist-check step when releasing. One is to detect symbols duplicated in
+        libjavascriptcoregtk and libwebkit2gtk that should be included to the version script. The other one is to ensure
+        all symbols listed in the script are present in the library.
+
+        * Scripts/check-for-global-bss-symbols-in-webkigtk-libs: Added.
+        (bss_symbols):
+        * Scripts/check-for-invalid-symbols-in-version-script: Added.
+        (script_symbols):
+        * Scripts/make-dist:
+        (Distcheck.build):
+        (Distcheck):
+        (Distcheck.check_symbols):
+        (Distcheck.check):
+
 2018-01-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/make-dist

@@ -257 +257 @@
         subprocess.check_call(command, cwd=build_dir)
 
+    def check_symbols(self, build_dir):
+        check_bss = os.path.join(self.source_root, 'Tools', 'Scripts', 'check-for-global-bss-symbols-in-webkigtk-libs')
+        libjsc = os.path.join(build_dir, 'lib', 'libjavascriptcoregtk-4.0.so')
+        libwk = os.path.join(build_dir, 'lib', 'libwebkit2gtk-4.0.so')
+        subprocess.check_call([check_bss, libjsc, libwk])
+
+        check_version_script = os.path.join(self.source_root, 'Tools', 'Scripts', 'check-for-invalid-symbols-in-version-script')
+        version_script = os.path.join(os.path.dirname(build_dir), 'Source', 'WebKit', 'webkitglib-symbols.map')
+        subprocess.check_call([check_version_script, version_script, libwk])
+
     def install(self, build_dir):
         subprocess.check_call(['make', 'install'], cwd=build_dir)
@@ -272 +282 @@
         self.configure(dist_dir, build_dir, install_dir, port)
         self.build(build_dir)
+        if port == 'GTK':
+            self.check_symbols(build_dir)
         self.install(build_dir)
         self.clean(dist_dir)