wok-current annotate xorg-server/stuff/CVE-2022-3551.patch @ rev 25634

Mass update, new toolchain gcc 8.3.0, glibc 2.28.0
author Stanislas Leduc <shann@slitaz.org>
date Sun Jan 14 08:12:37 2024 +0000 (20 months ago)
parents
children
rev   line source
shann@25634 1 From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001
shann@25634 2 From: Peter Hutterer <peter.hutterer@who-t.net>
shann@25634 3 Date: Wed, 13 Jul 2022 11:23:09 +1000
shann@25634 4 Subject: xkb: fix some possible memleaks in XkbGetKbdByName
shann@25634 5
shann@25634 6 GetComponentByName returns an allocated string, so let's free that if we
shann@25634 7 fail somewhere.
shann@25634 8
shann@25634 9 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
shann@25634 10 ---
shann@25634 11 xkb/xkb.c | 26 ++++++++++++++++++++------
shann@25634 12 1 file changed, 20 insertions(+), 6 deletions(-)
shann@25634 13
shann@25634 14 diff --git a/xkb/xkb.c b/xkb/xkb.c
shann@25634 15 index 4692895db..b79a269e3 100644
shann@25634 16 --- a/xkb/xkb.c
shann@25634 17 +++ b/xkb/xkb.c
shann@25634 18 @@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client)
shann@25634 19 xkb = dev->key->xkbInfo->desc;
shann@25634 20 status = Success;
shann@25634 21 str = (unsigned char *) &stuff[1];
shann@25634 22 - if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */
shann@25634 23 - return BadMatch;
shann@25634 24 + {
shann@25634 25 + char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */
shann@25634 26 + if (keymap) {
shann@25634 27 + free(keymap);
shann@25634 28 + return BadMatch;
shann@25634 29 + }
shann@25634 30 + }
shann@25634 31 names.keycodes = GetComponentSpec(&str, TRUE, &status);
shann@25634 32 names.types = GetComponentSpec(&str, TRUE, &status);
shann@25634 33 names.compat = GetComponentSpec(&str, TRUE, &status);
shann@25634 34 names.symbols = GetComponentSpec(&str, TRUE, &status);
shann@25634 35 names.geometry = GetComponentSpec(&str, TRUE, &status);
shann@25634 36 - if (status != Success)
shann@25634 37 + if (status == Success) {
shann@25634 38 + len = str - ((unsigned char *) stuff);
shann@25634 39 + if ((XkbPaddedSize(len) / 4) != stuff->length)
shann@25634 40 + status = BadLength;
shann@25634 41 + }
shann@25634 42 +
shann@25634 43 + if (status != Success) {
shann@25634 44 + free(names.keycodes);
shann@25634 45 + free(names.types);
shann@25634 46 + free(names.compat);
shann@25634 47 + free(names.symbols);
shann@25634 48 + free(names.geometry);
shann@25634 49 return status;
shann@25634 50 - len = str - ((unsigned char *) stuff);
shann@25634 51 - if ((XkbPaddedSize(len) / 4) != stuff->length)
shann@25634 52 - return BadLength;
shann@25634 53 + }
shann@25634 54
shann@25634 55 CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask);
shann@25634 56 CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask);
shann@25634 57 --
shann@25634 58 cgit v1.2.1
shann@25634 59