nx-libs/nx-X11/lib/X11/XKBGetMap.c, branch update-workflows

Convert nx-X11/lib/ build flow from imake to autotools.

2017-08-25T08:06:49+00:00

Rearrange some variable declarations & initializations in XKB

2016-10-19T19:40:28+00:00

Little things noticed during XKB restyling that seemed to make the code easier to read. Signed-off-by: Alan Coopersmith Backported-to-NX-by: Ulrich Sibiller

Reindent XKB code to X.Org standard style

2016-10-19T19:40:28+00:00

Signed-off-by: Alan Coopersmith Backported-to-NX-by: Ulrich Sibiller

Fix overflow checks in _XkbReadKeySyms when key_sym_map is already created

2016-10-19T19:40:28+00:00

We were checking to make sure that the largest keysym value was within the range of the allocated buffer, but checking against different limits in the not-yet-allocated vs. the already-allocated branches. The check should be the same in both, and reflect the size used for the allocation, which is based on the maximum key code value, so we move it to be a common check, before we branch, instead of duplicating in each branch. map->key_sym_map is an array of XkbSymMapRec structs, [0..max_key_code] map->syms is the array for which num_syms is recorded, hence is not the right value to check for ensuring our key_sym_map accesses are in range. Signed-off-by: Alan Coopersmith Reported-by: Barry Kauler Tested-by: Barry Kauler Backported-to-NX-by: Ulrich Sibiller

Align files with upstream libX11-1.6.0

2016-10-19T19:40:27+00:00

This commit looks a bit crazy at first glance. It (re-)introduces lots of whitespaces and bad formatting. Explanation: Backporting upstream changes lead to commits being applied out of order. This meant a lot of manual intervention which in turn lead to slight differences between upstream and NX. With this commit these slight differences are minimized which will be of great help when adding further upstream patches.

xkb: fix off-by-one in _XkbReadGetNamesReply and _XkbReadVirtualModMap

2016-10-19T19:40:27+00:00

The size of the arrays is max_key_code + 1. This makes these functions consistent with the other checks added for CVE-2013-1997. Also check the XkbGetNames reply when names->keys was just allocated. Signed-off-by: Julien Cristau Tested-by: Colin Walters Reviewed-by: Alan Coopersmith Backported-to-NX-by: Ulrich Sibiller

Revert "Add a couple fixups for the security patches"

2016-10-19T19:40:27+00:00

This reverts commit b092864a39bbcd4f34c5c26a7cd0df90e235815d. We will use the proper libX11 upstream patches now.

Add a couple fixups for the security patches

2016-10-12T07:34:39+00:00

Add a couple fixups for the security patches - off-by-one in xkb - memory leak in an error path Backport from debian to NX: Ulrich Sibiller

_XkbReadGetMapReply: reject maxKeyCodes smaller than the minKeyCode

2016-10-12T07:34:39+00:00

Various other bounds checks in the code assume this is true, so enforce it when we first get the data from the X server. Signed-off-by: Alan Coopersmith Signed-off-by: Julien Cristau Backported-to-NX-by: Ulrich Sibiller

unvalidated index in _XkbReadVirtualModMap() [CVE-2013-1997 10/15]

2016-10-12T07:34:39+00:00

If the X server returns modifier map indexes outside the range of the number of keys it told us to allocate, out of bounds memory writes could occur. Reported-by: Ilja Van Sprundel Signed-off-by: Alan Coopersmith Reviewed-by: Matthieu Herrb Signed-off-by: Julien Cristau Backported-to-NX-by: Ulrich Sibiller