Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com>
---
.../xserver-xorg/CVE-2021-3472.patch | 43 -------------------
...org_1.20.10.bb => xserver-xorg_1.20.11.bb} | 3 +-
2 files changed, 1 insertion(+), 45 deletions(-)
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-3472.patch
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_1.20.10.bb =>
xserver-xorg_1.20.11.bb} (91%)
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-3472.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-3472.patch
deleted file mode 100644
index 5480f71871..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-3472.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7aaf54a1884f71dc363f0b884e57bcb67407a6cd Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matth...@herrb.eu>
-Date: Sun, 21 Mar 2021 18:38:57 +0100
-Subject: [PATCH] Fix XChangeFeedbackControl() request underflow
-
-CVE-2021-3472 / ZDI-CAN-1259
-
-This vulnerability was discovered by:
-Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
-
-Signed-off-by: Matthieu Herrb <matth...@herrb.eu>
-
-Upstream-Status: Backport
-CVE: CVE-2021-3472
-
-Reference to upstream patch:
-[https://gitlab.freedesktop.org/xorg/xserver/-/commit/7aaf54a1884f71dc363f0b884e57bcb67407a6cd]
-
-Signed-off-by: Stefan Ghinea <stefan.ghi...@windriver.com>
----
- Xi/chgfctl.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
-index 1de4da9..7a597e4 100644
---- a/Xi/chgfctl.c
-+++ b/Xi/chgfctl.c
-@@ -464,8 +464,11 @@ ProcXChangeFeedbackControl(ClientPtr client)
- break;
- case StringFeedbackClass:
- {
-- xStringFeedbackCtl *f = ((xStringFeedbackCtl *) &stuff[1]);
-+ xStringFeedbackCtl *f;
-
-+ REQUEST_AT_LEAST_EXTRA_SIZE(xChangeFeedbackControlReq,
-+ sizeof(xStringFeedbackCtl));
-+ f = ((xStringFeedbackCtl *) &stuff[1]);
- if (client->swapped) {
- if (len < bytes_to_int32(sizeof(xStringFeedbackCtl)))
- return BadLength;
---
-2.17.1
-
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
similarity index 91%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
index 755a762a73..1eb2056b8a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb
@@ -7,9 +7,8 @@ SRC_URI +=
"file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
file://0001-drmmode_display.c-add-missing-mi.h-include.patch \
file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \
- file://CVE-2021-3472.patch \
"
-SRC_URI[sha256sum] =
"977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99"
+SRC_URI[sha256sum] =
"914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49"
# These extensions are now integrated into the server, so declare the migration
# path for in-place upgrades.
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#151320):
https://lists.openembedded.org/g/openembedded-core/message/151320
Mute This Topic: https://lists.openembedded.org/mt/82607073/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
