summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-05-24 09:53:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-05-25 12:36:00 +0100
commit58061d15ebd02ed2c78e09e855f18602e83a19a3 (patch)
tree147566bdc90701aeb47d5b0a98eeef9840c28b4c /meta/recipes-graphics/xorg-lib/libx11
parentb481883f0f4a639891a876030796eb01d3966425 (diff)
downloadpoky-58061d15ebd02ed2c78e09e855f18602e83a19a3.tar.gz
libx11: remove unused patch and FILESEXTRAPATHS
* 0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch was removed from SRC_URI in: https://git.openembedded.org/openembedded-core/commit/?id=e13f651f73db0f26f4645447ab5fa17e36d1903b (From OE-Core rev: ee37d9f05c047e1dd68e0cb47b809240d2f33835) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch b/meta/recipes-graphics/xorg-lib/libx11/0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch
deleted file mode 100644
index 722116c07e..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1CVE: CVE-2022-3554
2Upstream-Status: Backport
3Signed-off-by: Ross Burton <ross.burton@arm.com>
4
5From 1d11822601fd24a396b354fa616b04ed3df8b4ef Mon Sep 17 00:00:00 2001
6From: "Thomas E. Dickey" <dickey@invisible-island.net>
7Date: Tue, 4 Oct 2022 18:26:17 -0400
8Subject: [PATCH] fix a memory leak in XRegisterIMInstantiateCallback
9
10Analysis:
11
12 _XimRegisterIMInstantiateCallback() opens an XIM and closes it using
13 the internal function pointers, but the internal close function does
14 not free the pointer to the XIM (this would be done in XCloseIM()).
15
16Report/patch:
17
18 Date: Mon, 03 Oct 2022 18:47:32 +0800
19 From: Po Lu <luangruo@yahoo.com>
20 To: xorg-devel@lists.x.org
21 Subject: Re: Yet another leak in Xlib
22
23 For reference, here's how I'm calling XRegisterIMInstantiateCallback:
24
25 XSetLocaleModifiers ("");
26 XRegisterIMInstantiateCallback (compositor.display,
27 XrmGetDatabase (compositor.display),
28 (char *) compositor.resource_name,
29 (char *) compositor.app_name,
30 IMInstantiateCallback, NULL);
31
32 and XMODIFIERS is:
33
34 @im=ibus
35
36Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
37---
38 modules/im/ximcp/imInsClbk.c | 3 +++
39 1 file changed, 3 insertions(+)
40
41diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c
42index 95b379cb..c10e347f 100644
43--- a/modules/im/ximcp/imInsClbk.c
44+++ b/modules/im/ximcp/imInsClbk.c
45@@ -212,6 +212,9 @@ _XimRegisterIMInstantiateCallback(
46 if( xim ) {
47 lock = True;
48 xim->methods->close( (XIM)xim );
49+ /* XIMs must be freed manually after being opened; close just
50+ does the protocol to deinitialize the IM. */
51+ XFree( xim );
52 lock = False;
53 icb->call = True;
54 callback( display, client_data, NULL );
55--
562.34.1
57