Skip to contentSkip to conversation

package/x11r7/xserver_xorg-server: add security fix for CVE-2020-14347

PATCH New Bernd Kuhls 3 participants 7 messages Aug 10, 2020 – Aug 29, 2020 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add security fix for CVE-2020-14347

Release notes:
https://lists.x.org/archives/xorg-announce/2020-July/003051.html

---
 .../1.20.8/0007-fix-for-ZDI-11426.patch       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/1.20.8/0007-fix-for-ZDI-11426.patch
package/x11r7/xserver_xorg-server/1.20.8/0007-fix-for-ZDI-11426.patch new file +36 -0
new file mode 100644
index 0000000000..ce623b24cb
@@ -0,0 +1,36 @@
+From aac28e162e5108510065ad4c323affd6deffd816 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <[email protected]>
+Date: Sat, 25 Jul 2020 19:33:50 +0200
+Subject: [PATCH] fix for ZDI-11426
+
+Avoid leaking un-initalized memory to clients by zeroing the
+whole pixmap on initial allocation.
+
+This vulnerability was discovered by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+
+Signed-off-by: Matthieu Herrb <[email protected]>
+Reviewed-by: Alan Coopersmith <[email protected]>
+Signed-off-by: Bernd Kuhls <[email protected]>
+[downloaded from upstream commit
+ https://gitlab.freedesktop.org/xorg/xserver/-/commit/aac28e162e5108510065ad4c323affd6deffd816]
+---
+ dix/pixmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dix/pixmap.c b/dix/pixmap.c
+index 1186d7dbbf..5a0146bbb6 100644
+--- a/dix/pixmap.c
++++ b/dix/pixmap.c
+@@ -116,7 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
+     if (pScreen->totalPixmapSize > ((size_t) - 1) - pixDataSize)
+         return NullPixmap;
+ 
+-    pPixmap = malloc(pScreen->totalPixmapSize + pixDataSize);
++    pPixmap = calloc(1, pScreen->totalPixmapSize + pixDataSize);
+     if (!pPixmap)
+         return NullPixmap;
+ 
+-- 
+GitLab
+
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add security fix for CVE-2020-14347

Quoted 8 lines · On Mon, 10 Aug 2020 08:41:09 +0200 Bernd Kuhls <[email protected]> wrote:

Release notes:
https://lists.x.org/archives/xorg-announce/2020-July/003051.html

---
 .../1.20.8/0007-fix-for-ZDI-11426.patch       | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/1.20.8/0007-fix-for-ZDI-11426.patch

You had forgotten to set XSERVER_XORG_SERVER_IGNORE_CVES to ignore CVE-2020-14347 now that it is fixed by your patch. I have done so when the selected X.org version is 1.20.

This raises a question: what about the older X.org server releases? According to the NIST CVE entry, all versions prior to 1.20.9 are affected, so should the patch be backported to the other X.org server versions we support ?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add security fix for CVE-2020-14347

Am Tue, 11 Aug 2020 23:49:06 +0200 schrieb Thomas Petazzoni via buildroot:

Quoted 4 lines

This raises a question: what about the older X.org server releases? According to the NIST CVE entry, all versions prior to 1.20.9 are affected, so should the patch be backported to the other X.org server versions we support ?

Hi Thomas,

the bump to 1.20.9 fixed four CVEs in total which makes backporting upstream patches more complicated as time passes by and new issues arise, upstream does not update the older branches anymore:
https://cgit.freedesktop.org/xorg/xserver/

Due to the fact that personally I have no use for the older X.org server versions I would like to raise the question whether we can remove them? From my POV these older versions are unmaintained in buildroot because I want to concentrate on the current release which is the one I am using.

Regards, Bernd

#3 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add security fix for CVE-2020-14347

Quoted 15 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Am Tue, 11 Aug 2020 23:49:06 +0200 schrieb Thomas Petazzoni via buildroot:

Quoted 4 lines

This raises a question: what about the older X.org server releases? According to the NIST CVE entry, all versions prior to 1.20.9 are affected, so should the patch be backported to the other X.org server versions we support ?

Hi Thomas,

the bump to 1.20.9 fixed four CVEs in total which makes backporting upstream patches more complicated as time passes by and new issues arise, upstream does not update the older branches anymore:
https://cgit.freedesktop.org/xorg/xserver/

Quoted 4 lines

Due to the fact that personally I have no use for the older X.org server versions I would like to raise the question whether we can remove them? From my POV these older versions are unmaintained in buildroot because I want to concentrate on the current release which is the one I am using.

They were added to support various binary X11 video drivers, E.G. nvidia-tegra23 for 1.14.x and amd-catalyst for 1.19.x. Given that none of them have seen any real updates for ~5 years, I am fine with removing those packages and the older xserver versions.

Care to send patches for this?

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

PATCH 1/1 package/x11r7/xserver_xorg-server: add security fix for CVE-2020-14347

Hi Peter,

Am Fri, 28 Aug 2020 20:48:27 +0200 schrieb Peter Korsgaard:

Quoted 6 lines

They were added to support various binary X11 video drivers, E.G. nvidia-tegra23 for 1.14.x and amd-catalyst for 1.19.x. Given that none of them have seen any real updates for ~5 years, I am fine with removing those packages and the older xserver versions.

Care to send patches for this?

done: http://patchwork.ozlabs.org/project/buildroot/list/?series=198371

I have no idea and no time to investigate if there are alternative drivers available so I just removed the catalyst & tegra23 drivers.

Regards, Bernd

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add security fix

Hello,

Quoted 4 lines · On Fri, 28 Aug 2020 19:03:25 +0200 Bernd Kuhls <[email protected]> wrote:

Due to the fact that personally I have no use for the older X.org server versions I would like to raise the question whether we can remove them? From my POV these older versions are unmaintained in buildroot because I want to concentrate on the current release which is the one I am using.

The problem comes from closed-source X.org drivers, which only work with a certain X.org driver ABI.

We have amd-catalyst, which depends on ABI 19:

package/amd-catalyst/Config.in: depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19

And nvidia-tegra23, which depends on ABI 14:

package/nvidia-tegra23/Config.in: depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14

So if we want to remove older X.org versions, we have to see if newer versions of those drivers are available, and perhaps coordinate with the maintainers of those drivers.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com