[Git][xorg-team/lib/libxi][debian-unstable] 10 commits: Fix double alignment on 32bits machines with strict constraints

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libxi

Commits:

09f3eb57

by Matthieu Herrb at 2023-08-05T10:32:03+00:00

Fix double alignment on 32bits machines with strict constraints

a340bc04

by Alan Coopersmith at 2023-10-13T11:17:43-07:00

gitlab CI: Update to latest CI templates

Current template fails to rebuild the CI container with the current
Debian stable release (a new release since the last update)

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

57ce2e8b
by Peter Hutterer at 2024-01-29T11:27:32+10:00
```
Allow XIFreeDeviceInfo on a null pointer
```

56b11459

by kyomawolf at 2024-03-18T22:02:57+00:00

fixed wrong type in man page

Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxi/-/merge_requests/14>

dabce4db

by Alan Coopersmith at 2024-08-26T11:52:00-07:00

wireTo*Event: check for malloc() failure

Fixes 6 -Wanalyzer-possible-null-dereference and
1 -Wanalyzer-null-dereference and warnings from gcc 14.1

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxi/-/merge_requests/17>

a5af26c6

by Peter Hutterer at 2024-08-27T11:11:22+10:00

XGetFeedbackControl: skip over unknown feedback controls

If the server sends an unknown feedback control class we would allocate
the amount of *protocol* bytes for the client representation but then
later mess up the actual composition of the classes due to
Feedback->length never being initialized.

So while in theory it looks like this:
   |-------------- allocated size -----------------|
   [led feedback] [ ?unknown? ] [kbd feedback][....]
with unknown being the size of the class on the protocol,
in practice it looks like this:
   |-------------- allocated size -----------------|
   [led feedback] [ ?unknown?                ] [kbd feedback][...]
with unknown being the size of whatever was in the Feeback->length
pointed to at the time. The content of unknown is never initialized.

Fix this by making unknown classes disappear so the above becomes:
   |------- allocated size ---------|
   [led feedback][kbd feedback][....]

Closes #16

Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxi/-/merge_requests/18>

3c2d5aed

by Peter Hutterer at 2024-09-05T11:15:04+10:00

libXi 1.8.2

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

d1ec95c4

by Timo Aaltonen at 2024-09-25T10:44:40+03:00

Merge branch 'upstream-unstable' into debian-unstable

31c67320
by Timo Aaltonen at 2024-09-25T10:48:58+03:00
```
version bump
```
4ca8eb53
by Timo Aaltonen at 2024-09-25T10:49:05+03:00
```
releasing package libxi version 2:1.8.2-1
```

Changes:

.gitlab-ci.yml

  # vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
 -.templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 +.templates_sha: &template_sha 185ede0e9b9b1924b92306ab8b882a6294e92613 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
  include:
    - project: 'freedesktop/ci-templates'
@@ -19,7 +19,7 @@ stages:
    - deploy
  variables:
 -  FDO_DISTRIBUTION_TAG: '2021-05-30.8'  # change this to rebuild the images
 +  FDO_DISTRIBUTION_TAG: '2023-10-13.0'  # change this to rebuild the images
    FDO_UPSTREAM_REPO: 'xorg/lib/libxi'
    FDO_DISTRIBUTION_VERSION: 'stable'
    FDO_DISTRIBUTION_PACKAGES: 'git ca-certificates meson g++ make xutils-dev autoconf automake libtool pkg-config xmlto xorg-sgml-doctools w3m xsltproc libx11-dev libxext-dev libxfixes-dev'

configure.ac

  # Initialize Autoconf
  AC_PREREQ([2.60])
 -AC_INIT([libXi], [1.8.1],
 +AC_INIT([libXi], [1.8.2],
  	[https://gitlab.freedesktop.org/xorg/lib/libXi/issues], [libXi])
  AC_CONFIG_SRCDIR([Makefile.am])
  AC_CONFIG_HEADERS([src/config.h])

debian/changelog

 +libxi (2:1.8.2-1) unstable; urgency=medium
++
 +  * New upstream release.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Wed, 25 Sep 2024 10:48:59 +0300
++
  libxi (2:1.8.1-1) unstable; urgency=medium
    [ Timo Aaltonen ]

man/XGetDeviceProperty.txt

@@ -32,7 +32,7 @@ SYNOPSIS
                                 Atom type,
                                 int format,
                                 int mode,
 -                               const char *data,
 +                               const unsigned char *data,
                                 int nelements)
     void XDeleteDeviceProperty( Display *display,

src/XExtInt.c

@@ -1428,16 +1428,18 @@ copyRawEvent(XGenericEventCookie *cookie_in,
      in = cookie_in->data;
      bits = count_bits(in->valuators.mask, in->valuators.mask_len);
 -    len = sizeof(XIRawEvent) + in->valuators.mask_len;
 +    len = pad_to_double(sizeof(XIRawEvent))
 +        + pad_to_double(in->valuators.mask_len);
      len += bits * sizeof(double) * 2;
      ptr = cookie_out->data = malloc(len);
      if (!ptr)
          return False;
 -    out = next_block(&ptr, sizeof(XIRawEvent));
 +    out = next_block(&ptr, pad_to_double(sizeof(XIRawEvent)));
      *out = *in;
 -    out->valuators.mask = next_block(&ptr, out->valuators.mask_len);
 +    out->valuators.mask
 +        = next_block(&ptr, pad_to_double(out->valuators.mask_len));
      memcpy(out->valuators.mask, in->valuators.mask, out->valuators.mask_len);
      out->valuators.values = next_block(&ptr, bits * sizeof(double));
@@ -1595,6 +1597,8 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie)
      len = sizeDeviceEvent(in->buttons_len * 4, in->valuators_len * 4, ptr);
      cookie->data = ptr_lib = malloc(len);
 +    if (!ptr_lib)
 +        return 0;
      out = next_block(&ptr_lib, sizeof(XIDeviceEvent));
      out->display = cookie->display;
@@ -1888,6 +1892,8 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie)
      len = size_classes((xXIAnyInfo*)&in[1], in->num_classes);
      cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len);
 +    if (!out)
 +        return 0;
      out->type = in->type;
      out->serial = cookie->serial;
@@ -1918,7 +1924,9 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie)
      xXIHierarchyInfo *info_in;
      XIHierarchyEvent *out;
 -    cookie->data = out = malloc(sizeof(XIHierarchyEvent) + in->num_info * sizeof(XIHierarchyInfo));;
 +    cookie->data = out = malloc(sizeof(XIHierarchyEvent) + in->num_info * sizeof(XIHierarchyInfo));
 +    if (!out)
 +        return 0;
      out->info           = (XIHierarchyInfo*)&out[1];
      out->display        = cookie->display;
@@ -1954,7 +1962,8 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook
      XIRawEvent *out;
      void *ptr;
 -    len = sizeof(XIRawEvent) + in->valuators_len * 4;
 +    len = pad_to_double(sizeof(XIRawEvent))
 +        + pad_to_double(in->valuators_len * 4);
      bits = count_bits((unsigned char*)&in[1], in->valuators_len * 4);
      len += bits * sizeof(double) * 2; /* raw + normal */
@@ -1962,7 +1971,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook
      if (!ptr)
          return 0;
 -    out = next_block(&ptr, sizeof(XIRawEvent));
 +    out = next_block(&ptr, pad_to_double(sizeof(XIRawEvent)));
      out->type           = in->type;
      out->serial         = cookie->serial;
      out->display        = cookie->display;
@@ -1981,7 +1990,8 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook
          out->sourceid       = 0;
      out->valuators.mask_len = in->valuators_len * 4;
 -    out->valuators.mask = next_block(&ptr, out->valuators.mask_len);
 +    out->valuators.mask
 +        = next_block(&ptr, pad_to_double(out->valuators.mask_len));
      memcpy(out->valuators.mask, &in[1], out->valuators.mask_len);
      out->valuators.values = next_block(&ptr, bits * sizeof(double));
@@ -2012,6 +2022,9 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie)
      len = sizeof(XIEnterEvent) + in->buttons_len * 4;
      cookie->data = out = malloc(len);
 +    if (!out)
 +        return 0;
++
      out->buttons.mask = (unsigned char*)&out[1];
      out->type           = in->type;
@@ -2056,6 +2069,8 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie)
      XIPropertyEvent *out = malloc(sizeof(XIPropertyEvent));
      cookie->data = out;
 +    if (!out)
 +        return 0;
      out->type           = in->type;
      out->serial         = cookie->serial;
@@ -2077,6 +2092,8 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in,
      XITouchOwnershipEvent *out = malloc(sizeof(XITouchOwnershipEvent));
      cookie->data = out;
 +    if (!out)
 +        return 0;
      out->type           = in->type;
      out->serial         = cookie->serial;
@@ -2102,6 +2119,8 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie)
      XIBarrierEvent *out = malloc(sizeof(XIBarrierEvent));
      cookie->data = out;
 +    if (!out)
 +        return 0;
      out->display    = cookie->display;
      out->type       = in->type;
@@ -2133,6 +2152,8 @@ wireToPinchEvent(xXIGesturePinchEvent *in,
      XIGesturePinchEvent *out;
      cookie->data = out = malloc(sizeof(XIGesturePinchEvent));
 +    if (!out)
 +        return 0;
      out->display    = cookie->display;
      out->type       = in->type;
@@ -2178,6 +2199,8 @@ wireToSwipeEvent(xXIGestureSwipeEvent *in,
      XIGestureSwipeEvent *out;
      cookie->data = out = malloc(sizeof(XIGestureSwipeEvent));
 +    if (!out)
 +        return 0;
      out->display    = cookie->display;
      out->type       = in->type;

src/XGetFCtl.c

@@ -67,7 +67,7 @@ XFeedbackState *
  XGetFeedbackControl(
      register Display	*dpy,
      XDevice		*dev,
 -    int			*num_feedbacks)
 +    int			*num_feedbacks_out)
+ {
      XFeedbackState *Feedback = NULL;
      XFeedbackState *Sav = NULL;
@@ -77,6 +77,8 @@ XGetFeedbackControl(
      xGetFeedbackControlReq *req;
      xGetFeedbackControlReply rep;
      XExtDisplayInfo *info = XInput_find_display(dpy);
 +    int num_feedbacks = 0;
 +    int known_feedbacks = 0;
      LockDisplay(dpy);
      if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
@@ -95,7 +97,7 @@ XGetFeedbackControl(
  	size_t size = 0;
  	int i;
 -	*num_feedbacks = rep.num_feedbacks;
 +	num_feedbacks = rep.num_feedbacks;
  	if (rep.length < (INT_MAX >> 2)) {
  	    nbytes = rep.length << 2;
@@ -109,7 +111,7 @@ XGetFeedbackControl(
  	end = (char *)f + nbytes;
  	_XRead(dpy, (char *)f, nbytes);
 -	for (i = 0; i < *num_feedbacks; i++) {
 +	for (i = 0; i < num_feedbacks; i++) {
  	    if ((char *)f + sizeof(*f) > end ||
  	        f->length == 0 || f->length > nbytes)
  		goto out;
@@ -141,7 +143,7 @@ XGetFeedbackControl(
  		size += sizeof(XBellFeedbackState);
  		break;
  	    default:
 -		size += f->length;
 +		/* unknown classes are skipped */
  		break;
+ 	    }
  	    if (size > INT_MAX)
@@ -154,9 +156,11 @@ XGetFeedbackControl(
  	    goto out;
  	Sav = Feedback;
 +	known_feedbacks = num_feedbacks;
  	f = sav;
 -	for (i = 0; i < *num_feedbacks; i++) {
 +	for (i = 0; i < num_feedbacks; i++) {
 +	    Bool skip = False;
  	    switch (f->class) {
  	    case KbdFeedbackClass:
+ 	    {
@@ -262,14 +266,18 @@ XGetFeedbackControl(
  		break;
+ 	    }
  	    default:
 +		--known_feedbacks;
 +		skip = True;
  		break;
+ 	    }
  	    f = (xFeedbackState *) ((char *)f + f->length);
 -	    Feedback = (XFeedbackState *) ((char *)Feedback + Feedback->length);
 +	    if (!skip)
 +		Feedback = (XFeedbackState *) ((char *)Feedback + Feedback->length);
+ 	}
+     }
  out:
      XFree((char *)sav);
 +    *num_feedbacks_out = known_feedbacks;
      UnlockDisplay(dpy);
      SyncHandle();

src/XIQueryDevice.c


 XIFreeDeviceInfo(XIDeviceInfo* info)
 {
     XIDeviceInfo *ptr = info;
-    while(ptr->name)
+    while(ptr && ptr->name)
     {
         Xfree(ptr->classes);
         Xfree(ptr->name);