Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
5eb019155a
109
0044-QLibrary-fix-deadlock-caused-by-fix-to-QTBUG-39642.patch
Normal file
109
0044-QLibrary-fix-deadlock-caused-by-fix-to-QTBUG-39642.patch
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||||
|
Date: Thu, 2 Apr 2020 12:08:41 -0300
|
||||||
|
Subject: [PATCH 44/49] QLibrary: fix deadlock caused by fix to QTBUG-39642
|
||||||
|
|
||||||
|
Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
|
||||||
|
the entire load_sys(). We had reasoed that deadlocks would only occur if
|
||||||
|
the object creation in instance() recursed into its own instance(),
|
||||||
|
which was already a bug. But we had forgotten that dlopen()/
|
||||||
|
LoadLibrary() executes initialization code from the module being loaded,
|
||||||
|
which could cause a recursion back into the same QPluginLoader or
|
||||||
|
QLibrary object. This recursion is benign because the module *is* loaded
|
||||||
|
and dlopen()/LoadLibrary() returns the same handle.
|
||||||
|
|
||||||
|
[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
|
||||||
|
would happen if the plugin or library being loaded has load-time
|
||||||
|
initialization code (C++ global variables) that recursed back into the
|
||||||
|
same QLibrary or QPluginLoader object.
|
||||||
|
|
||||||
|
PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
|
||||||
|
lock, so pluginState should be made an atomic variable. Once that is
|
||||||
|
done, we'll only need locking the mutex to update errorString (no
|
||||||
|
locking before loading).
|
||||||
|
|
||||||
|
Fixes: QTBUG-83207
|
||||||
|
Task-number: QTBUG-39642
|
||||||
|
Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
|
||||||
|
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
||||||
|
Reviewed-by: David Faure <david.faure@kdab.com>
|
||||||
|
---
|
||||||
|
src/corelib/plugin/qlibrary.cpp | 2 --
|
||||||
|
src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
|
||||||
|
src/corelib/plugin/qlibrary_win.cpp | 3 +++
|
||||||
|
3 files changed, 7 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
|
||||||
|
index ddb053c26f..be9d92b204 100644
|
||||||
|
--- a/src/corelib/plugin/qlibrary.cpp
|
||||||
|
+++ b/src/corelib/plugin/qlibrary.cpp
|
||||||
|
@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
|
||||||
|
|
||||||
|
Q_TRACE(QLibraryPrivate_load_entry, fileName);
|
||||||
|
|
||||||
|
- mutex.lock();
|
||||||
|
bool ret = load_sys();
|
||||||
|
- mutex.unlock();
|
||||||
|
if (qt_debug_component()) {
|
||||||
|
if (ret) {
|
||||||
|
qDebug() << "loaded library" << fileName;
|
||||||
|
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
|
||||||
|
index 017aa97b66..a5c72f81d9 100644
|
||||||
|
--- a/src/corelib/plugin/qlibrary_unix.cpp
|
||||||
|
+++ b/src/corelib/plugin/qlibrary_unix.cpp
|
||||||
|
@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
|
||||||
|
|
||||||
|
bool QLibraryPrivate::load_sys()
|
||||||
|
{
|
||||||
|
+ QMutexLocker locker(&mutex);
|
||||||
|
QString attempt;
|
||||||
|
QFileSystemEntry fsEntry(fileName);
|
||||||
|
|
||||||
|
@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ locker.unlock();
|
||||||
|
bool retry = true;
|
||||||
|
Handle hnd = nullptr;
|
||||||
|
for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
|
||||||
|
@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+ locker.relock();
|
||||||
|
if (!hnd) {
|
||||||
|
errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
|
||||||
|
}
|
||||||
|
diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
|
||||||
|
index 000bf76276..ef58724be8 100644
|
||||||
|
--- a/src/corelib/plugin/qlibrary_win.cpp
|
||||||
|
+++ b/src/corelib/plugin/qlibrary_win.cpp
|
||||||
|
@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
|
||||||
|
// fileName
|
||||||
|
//
|
||||||
|
// NB If it's a plugin we do not ever try the ".dll" extension
|
||||||
|
+ QMutexLocker locker(&mutex);
|
||||||
|
QStringList attempts;
|
||||||
|
|
||||||
|
if (pluginState != IsAPlugin)
|
||||||
|
@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
|
||||||
|
attempts.prepend(QDir::rootPath() + fileName);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ locker.unlock();
|
||||||
|
Handle hnd = nullptr;
|
||||||
|
for (const QString &attempt : qAsConst(attempts)) {
|
||||||
|
#ifndef Q_OS_WINRT
|
||||||
|
@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
|
||||||
|
#ifndef Q_OS_WINRT
|
||||||
|
SetErrorMode(oldmode);
|
||||||
|
#endif
|
||||||
|
+ locker.relock();
|
||||||
|
if (!hnd) {
|
||||||
|
errorString = QLibrary::tr("Cannot load library %1: %2").arg(
|
||||||
|
QDir::toNativeSeparators(fileName), qt_error_string());
|
||||||
|
--
|
||||||
|
2.25.2
|
||||||
|
|
@ -53,7 +53,7 @@ BuildRequires: pkgconfig(libsystemd)
|
|||||||
Name: qt5-qtbase
|
Name: qt5-qtbase
|
||||||
Summary: Qt5 - QtBase components
|
Summary: Qt5 - QtBase components
|
||||||
Version: 5.14.2
|
Version: 5.14.2
|
||||||
Release: 2.0.riscv64%{?dist}
|
Release: 4.0.riscv64%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
@ -106,6 +106,9 @@ Patch53: qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch
|
|||||||
# respect QMAKE_LFLAGS_RELEASE when building qmake
|
# respect QMAKE_LFLAGS_RELEASE when building qmake
|
||||||
Patch54: qtbase-qmake_LFLAGS.patch
|
Patch54: qtbase-qmake_LFLAGS.patch
|
||||||
|
|
||||||
|
# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
|
||||||
|
Patch55: qtbase-everywhere-src-5.14.2-no_relocatable.patch
|
||||||
|
|
||||||
# drop -O3 and make -O2 by default
|
# drop -O3 and make -O2 by default
|
||||||
Patch61: qt5-qtbase-cxxflag.patch
|
Patch61: qt5-qtbase-cxxflag.patch
|
||||||
|
|
||||||
@ -126,6 +129,7 @@ Patch80: qtbase-use-wayland-on-gnome.patch
|
|||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
Patch100: qt5-qtbase-CVE-2015-9541.patch
|
Patch100: qt5-qtbase-CVE-2015-9541.patch
|
||||||
|
Patch144: 0044-QLibrary-fix-deadlock-caused-by-fix-to-QTBUG-39642.patch
|
||||||
|
|
||||||
|
|
||||||
# RISC-V: must use -pthread to link libatomic
|
# RISC-V: must use -pthread to link libatomic
|
||||||
@ -388,6 +392,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|||||||
%patch52 -p1 -b .moc_macros
|
%patch52 -p1 -b .moc_macros
|
||||||
%patch53 -p1 -b .qt5gui_cmake_isystem_includes
|
%patch53 -p1 -b .qt5gui_cmake_isystem_includes
|
||||||
%patch54 -p1 -b .qmake_LFLAGS
|
%patch54 -p1 -b .qmake_LFLAGS
|
||||||
|
%patch55 -p1 -b .no_relocatable
|
||||||
%patch61 -p1 -b .qt5-qtbase-cxxflag
|
%patch61 -p1 -b .qt5-qtbase-cxxflag
|
||||||
%patch64 -p1 -b .firebird
|
%patch64 -p1 -b .firebird
|
||||||
%if 0%{?fedora} > 27
|
%if 0%{?fedora} > 27
|
||||||
@ -401,6 +406,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
|||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
%patch100 -p1 -b .CVE-2015-9541
|
%patch100 -p1 -b .CVE-2015-9541
|
||||||
|
%patch144 -p1 -b .0044
|
||||||
|
|
||||||
# riscv
|
# riscv
|
||||||
%ifarch riscv64
|
%ifarch riscv64
|
||||||
@ -498,6 +504,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
|
|||||||
-system-zlib \
|
-system-zlib \
|
||||||
%{?use_gold_linker} \
|
%{?use_gold_linker} \
|
||||||
-no-directfb \
|
-no-directfb \
|
||||||
|
-no-feature-relocatable \
|
||||||
%{?no_feature_renameat2} \
|
%{?no_feature_renameat2} \
|
||||||
%{?no_feature_statx} \
|
%{?no_feature_statx} \
|
||||||
QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
|
QMAKE_CFLAGS_RELEASE="${CFLAGS:-$RPM_OPT_FLAGS}" \
|
||||||
@ -1050,9 +1057,15 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Apr 09 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 5.14.2-2.0.riscv64
|
* Thu Apr 16 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 5.14.2-4.0.riscv64
|
||||||
- Replace -lpthread with -pthread
|
- Replace -lpthread with -pthread
|
||||||
|
|
||||||
|
* Tue Apr 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-4
|
||||||
|
- backport "Mutex deadlock in QPluginLoader, Krita fails to start" (QTBUG-83207)
|
||||||
|
|
||||||
|
* Mon Apr 13 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-3
|
||||||
|
- %%build: -no-feature-relocatable + matching patch (#1823118)
|
||||||
|
|
||||||
* Wed Apr 08 2020 Than Ngo <than@redhat.com> - 5.14.2-2
|
* Wed Apr 08 2020 Than Ngo <than@redhat.com> - 5.14.2-2
|
||||||
- Fixed bz#1801370 - CVE-2015-9541 XML entity expansion vulnerability via a crafted SVG document
|
- Fixed bz#1801370 - CVE-2015-9541 XML entity expansion vulnerability via a crafted SVG document
|
||||||
|
|
||||||
|
16
qtbase-everywhere-src-5.14.2-no_relocatable.patch
Normal file
16
qtbase-everywhere-src-5.14.2-no_relocatable.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff -up qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp.no_relocatable qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp
|
||||||
|
--- qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp.no_relocatable 2020-03-27 04:49:31.000000000 -0500
|
||||||
|
+++ qtbase-everywhere-src-5.14.2/src/corelib/global/qlibraryinfo.cpp 2020-04-13 15:13:44.075705226 -0500
|
||||||
|
@@ -671,8 +671,11 @@ static QString getPrefix(
|
||||||
|
# if QT_CONFIGURE_CROSSBUILD
|
||||||
|
if (group == QLibraryInfo::DevicePaths)
|
||||||
|
return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
|
||||||
|
-# endif
|
||||||
|
+# elif 0 //QT_CONFIG(relocatable)
|
||||||
|
return getExtPrefixFromHostBinDir();
|
||||||
|
+# else
|
||||||
|
+ return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
|
||||||
|
+# endif
|
||||||
|
#elif QT_CONFIG(relocatable)
|
||||||
|
return getRelocatablePrefix();
|
||||||
|
#else
|
Loading…
Reference in New Issue
Block a user