package/cog: fix segfaults on null xkb_data keymap/state
PATCH 1/1 package/cog: fix segfaults on null xkb_data keymap/state
Fixes:
Program terminated with signal SIGSEGV, Segmentation fault.
#0 xkb_state_key_get_layout (state=state at entry=0x0, kc=kc at entry=50) at ../src/state.c:217
Program terminated with signal SIGSEGV, Segmentation fault. #0 XkbKey (kc=kc at entry=45, keymap=0x0) at ../src/keymap.h:430
--- ...ata.state-is-not-null-before-calling.patch | 30 +++++++++++++++++++ ...ata.keymap-is-not-null-before-callin.patch | 30 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch create mode 100644 package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch
package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 575ef199984ae4e8510ed36f8b1ae1babdff8ea9 Mon Sep 17 00:00:00 2001 +From: James Hilliard <[email protected]> +Date: Thu, 26 Mar 2020 07:48:19 -0600 +Subject: [PATCH] fdo: ensure xkb_data.state is not null before calling + xkb_state_key_get_one_sym (#192) + +[james.hilliard1 at gmail.com: backport from upstream commit +575ef199984ae4e8510ed36f8b1ae1babdff8ea9] +Signed-off-by: James Hilliard <[email protected]> +--- + platform/cog-platform-fdo.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c +index 043f91d..93ff255 100644 +--- a/platform/cog-platform-fdo.c ++++ b/platform/cog-platform-fdo.c +@@ -919,6 +919,9 @@ capture_app_key_bindings (uint32_t keysym, + static void + handle_key_event (uint32_t key, uint32_t state, uint32_t time) + { ++ if (xkb_data.state == NULL) ++ return; ++ + uint32_t keysym = xkb_state_key_get_one_sym (xkb_data.state, key); + uint32_t unicode = xkb_state_key_get_utf32 (xkb_data.state, key); + +-- +2.20.1 +
package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 817f6c9dafd5ad23722eae0a8f43ba9211f37c95 Mon Sep 17 00:00:00 2001 +From: James Hilliard <[email protected]> +Date: Thu, 26 Mar 2020 07:49:05 -0600 +Subject: [PATCH] fdo: ensure xkb_data.keymap is not null before calling + xkb_keymap_key_repeats (#193) + +[james.hilliard1 at gmail.com: backport from upstream commit +817f6c9dafd5ad23722eae0a8f43ba9211f37c95] +Signed-off-by: James Hilliard <[email protected]> +--- + platform/cog-platform-fdo.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c +index 93ff255..ecc05e9 100644 +--- a/platform/cog-platform-fdo.c ++++ b/platform/cog-platform-fdo.c +@@ -990,7 +990,8 @@ keyboard_on_key (void *data, + memset (&wl_data.keyboard.repeat_data, + 0x00, + sizeof (wl_data.keyboard.repeat_data)); +- } else if (state == WL_KEYBOARD_KEY_STATE_PRESSED ++ } else if (xkb_data.keymap != NULL ++ && state == WL_KEYBOARD_KEY_STATE_PRESSED + && xkb_keymap_key_repeats (xkb_data.keymap, key)) { + if (wl_data.keyboard.repeat_data.event_source) + g_source_remove (wl_data.keyboard.repeat_data.event_source); +-- +2.20.1 +
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/cog: fix segfaults on null xkb_data keymap/state
Quoted 7 lines · On Fri, 27 Mar 2020 12:26:39 -0600 James Hilliard <[email protected]>…
Fixes:
Program terminated with signal SIGSEGV, Segmentation fault.
#0xkb_state_key_get_layout(state=state at entry=0x0, kc=kc at entry=50) at../src/state.c:217Program terminated with signal SIGSEGV, Segmentation fault. #0 XkbKey (kc=kc at entry=45, keymap=0x0) at
../src/keymap.h:430
Quoted 7 lines
Signed-off-by James Hilliard <[email protected]>--- ...ata.state-is-not-null-before-calling.patch | 30 +++++++++++++++++++ ...ata.keymap-is-not-null-before-callin.patch | 30 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 package/cog/0002-fdo-ensure-xkb_data.state-is-not-null-before-calling.patch create mode 100644 package/cog/0003-fdo-ensure-xkb_data.keymap-is-not-null-before-callin.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/cog: fix segfaults on null xkb_data keymap/state
In reply to James HilliardQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"James" == James Hilliard <[email protected]> writes:
Fixes:
Program terminated with signal SIGSEGV, Segmentation fault.
#0xkb_state_key_get_layout(state=state at entry=0x0, kc=kc at entry=50) at../src/state.c:217Program terminated with signal SIGSEGV, Segmentation fault. #0 XkbKey (kc=kc at entry=45, keymap=0x0) at
../src/keymap.h:430Signed-off-by James Hilliard <[email protected]>
Committed to 2020.02.x and 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard