Skip to contentSkip to conversation

package/qt5base: add patch to fix CVE-2020-0569 for LTS

PATCH New Peter Seiderer 2 participants 8 messages Jan 30, 2020 – Mar 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/qt5base: add patch to fix CVE-2020-0569 for LTS

Add upstream patch to fix CVE-2020-0569 for LTS version (see [1] for details).

[1] https://www.openwall.com/lists/oss-security/2020/01/30/1

---
 ...0005-Do-not-load-plugin-from-the-PWD.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch new file +32 -0
new file mode 100644
index 0000000000..4acd42f005
@@ -0,0 +1,32 @@
+From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <[email protected]>
+Date: Fri, 8 Nov 2019 11:30:40 +0100
+Subject: [PATCH] Do not load plugin from the $PWD
+
+I see no reason why this would make sense to look for plugins in the current
+directory. And when there are plugins there, it may actually be wrong
+
+Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
+Reviewed-by: Thiago Macieira <[email protected]>
+
+Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ src/corelib/plugin/qpluginloader.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
+index cadff4f32b..c2443dbdda 100644
+--- a/src/corelib/plugin/qpluginloader.cpp
++++ b/src/corelib/plugin/qpluginloader.cpp
+@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
+         paths.append(fileName.left(slash)); // don't include the '/'
+     } else {
+         paths = QCoreApplication::libraryPaths();
+-        paths.prepend(QStringLiteral(".")); // search in current dir first
+     }
+ 
+     for (const QString &path : qAsConst(paths)) {
+-- 
+2.25.0
+
Signature · 1 line
2.25.0
#1 lore raw

PATCH 2/2 package/qt5base: add patches to fix CVE-2020-0569 and CVE-2020-0570 for latest

Add upstream patches to fix CVE-2020-0569 and CVE-2020-0570 for latest qt version (for details see [1]).

[1] https://www.openwall.com/lists/oss-security/2020/01/30/1

---
 ...0003-Do-not-load-plugin-from-the-PWD.patch | 32 ++++++++++
 ...-not-attempt-to-load-a-library-relat.patch | 59 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 package/qt5/qt5base/5.12.5/0003-Do-not-load-plugin-from-the-PWD.patch
 create mode 100644 package/qt5/qt5base/5.12.5/0004-QLibrary-Unix-do-not-attempt-to-load-a-library-relat.patch
package/qt5/qt5base/5.12.5/0003-Do-not-load-plugin-from-the-PWD.patch new file +32 -0
new file mode 100644
index 0000000000..4acd42f005
@@ -0,0 +1,32 @@
+From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <[email protected]>
+Date: Fri, 8 Nov 2019 11:30:40 +0100
+Subject: [PATCH] Do not load plugin from the $PWD
+
+I see no reason why this would make sense to look for plugins in the current
+directory. And when there are plugins there, it may actually be wrong
+
+Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
+Reviewed-by: Thiago Macieira <[email protected]>
+
+Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ src/corelib/plugin/qpluginloader.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
+index cadff4f32b..c2443dbdda 100644
+--- a/src/corelib/plugin/qpluginloader.cpp
++++ b/src/corelib/plugin/qpluginloader.cpp
+@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
+         paths.append(fileName.left(slash)); // don't include the '/'
+     } else {
+         paths = QCoreApplication::libraryPaths();
+-        paths.prepend(QStringLiteral(".")); // search in current dir first
+     }
+ 
+     for (const QString &path : qAsConst(paths)) {
+-- 
+2.25.0
+
package/qt5/qt5base/5.12.5/0004-QLibrary-Unix-do-not-attempt-to-load-a-library-relat.patch new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
2.25.0
#2 lore raw

PATCH 2/2 package/qt5base: add patches to fix CVE-2020-0569 and CVE-2020-0570 for latest

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Add upstream patches to fix CVE-2020-0569 and CVE-2020-0570 for latest qt version (for details see [1]).

[1] https://www.openwall.com/lists/oss-security/2020/01/30/1

Committed after extending the commit message a bit, thanks.

I see from the advisory that there is a 5.12.7 version with this fix included. Any specific reason why we don't bump the version instead?

https://download.qt.io/archive/qt/5.12/5.12.7/

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 package/qt5base: add patches to fix CVE-2020-0569 and CVE-2020-0570 for latest

Hello Peter,

Quoted 5 lines · Peter Korsgaard
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Add upstream patches to fix CVE-2020-0569 and CVE-2020-0570 for latest qt version (for details see [1]).

Quoted 8 lines
Quoted 3 lines

[1] https://www.openwall.com/lists/oss-security/2020/01/30/1

Committed after extending the commit message a bit, thanks.

I see from the advisory that there is a 5.12.7 version with this fix included. Any specific reason why we don't bump the version instead?

Because the advisory states 'fixed 5.12.7 (future)'...

Quoted 3 lines

https://download.qt.io/archive/qt/5.12/5.12.7/

...and the version is only available since two days (and the sha256 sums only since yesterday)..., but version bump patch will follow soon ;-)

Regards,
Peter

#4 lore raw

PATCH 2/2 package/qt5base: add patches to fix CVE-2020-0569 and CVE-2020-0570 for latest

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Hi,

Quoted 4 lines
Quoted 1 line

https://download.qt.io/archive/qt/5.12/5.12.7/

...and the version is only available since two days (and the sha256 sums only since yesterday)..., but version bump patch will follow soon ;-)

Great, thanks!

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 2/2 package/qt5base: add patches to fix CVE-2020-0569 and CVE-2020-0570 for latest

In reply to Peter Seiderer
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Add upstream patches to fix CVE-2020-0569 and CVE-2020-0570 for latest qt version (for details see [1]).

[1] https://www.openwall.com/lists/oss-security/2020/01/30/1

Committed to 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/2 package/qt5base: add patch to fix CVE-2020-0569 for LTS

In reply to Peter Seiderer
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Add upstream patch to fix CVE-2020-0569 for LTS version (see [1] for details).

[1] https://www.openwall.com/lists/oss-security/2020/01/30/1

Committed after extending the commit message a bit, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#7 lore raw

PATCH 1/2 package/qt5base: add patch to fix CVE-2020-0569 for LTS

In reply to Peter Seiderer
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Add upstream patch to fix CVE-2020-0569 for LTS version (see [1] for details).

[1] https://www.openwall.com/lists/oss-security/2020/01/30/1

Committed to 2019.11.x, thanks.

Quoted 52 lines
---
 ...0005-Do-not-load-plugin-from-the-PWD.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch

diff --git a/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch b/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch new file mode 100644
index 0000000000..4acd42f005

package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch new file +32 -0
@@ -0,0 +1,32 @@
+From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <[email protected]>
+Date: Fri, 8 Nov 2019 11:30:40 +0100
+Subject: [PATCH] Do not load plugin from the $PWD
+
+I see no reason why this would make sense to look for plugins in the current
+directory. And when there are plugins there, it may actually be wrong
+
+Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
+Reviewed-by: Thiago Macieira <[email protected]>
+
+Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ src/corelib/plugin/qpluginloader.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
+index cadff4f32b..c2443dbdda 100644
+--- a/src/corelib/plugin/qpluginloader.cpp
++++ b/src/corelib/plugin/qpluginloader.cpp
+@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
+         paths.append(fileName.left(slash)); // don't include the '/'
+     } else {
+         paths = QCoreApplication::libraryPaths();
+-        paths.prepend(QStringLiteral(".")); // search in current dir first
+     }
+ 
+     for (const QString &path : qAsConst(paths)) {
+-- 
+2.25.0
+
Signature · 6 lines
2.25.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard