[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg-devel
Subject:    Re: [PATCH] xkb: ignore floating slave devices when updating from master (#81885)
From:       Daniel Stone <daniel () fooishbar ! org>
Date:       2014-08-12 14:02:41
Message-ID: CAPj87rNaSPNahbdtgG-gKuzaEr-GB-wUFytbyor181-84JKHzA () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


R-b.
-d

On Monday, August 11, 2014, Peter Hutterer <peter.hutterer@who-t.net> wrote:

> ping?
>
> On Mon, Aug 04, 2014 at 10:47:03AM +1000, Peter Hutterer wrote:
> > Introduced in 45fb3a934dc0db51584aba37c2f9d73deff9191d. When a device is
> > enabled, the master's locked state is pushed to the slave. If the device
> is
> > floating, no master exists and we triggered a NULL-pointer dereference
> > in XkbPushLockedStateToSlaves.
> >
> > X.Org Bug 81885 <http://bugs.freedesktop.org/show_bug.cgi?id=81885>
> >
> > Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net <javascript:;>>
> > ---
> >  dix/devices.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/dix/devices.c b/dix/devices.c
> > index 7f079ff..9e1c546 100644
> > --- a/dix/devices.c
> > +++ b/dix/devices.c
> > @@ -416,7 +416,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
> >          XISendDeviceHierarchyEvent(flags);
> >      }
> >
> > -    if (!IsMaster(dev))
> > +    if (!IsMaster(dev) && !IsFloating(dev))
> >          XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0,
> 0);
> >      RecalculateMasterButtons(dev);
> >
> > --
> > 1.9.3
> _______________________________________________
> xorg-devel@lists.x.org <javascript:;>: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>

[Attachment #5 (text/html)]

R-b.<div>-d<span></span><br><br>On Monday, August 11, 2014, Peter Hutterer &lt;<a \
href="mailto:peter.hutterer@who-t.net">peter.hutterer@who-t.net</a>&gt; \
wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px \
#ccc solid;padding-left:1ex"> ping?<br>
<br>
On Mon, Aug 04, 2014 at 10:47:03AM +1000, Peter Hutterer wrote:<br>
&gt; Introduced in 45fb3a934dc0db51584aba37c2f9d73deff9191d. When a device is<br>
&gt; enabled, the master&#39;s locked state is pushed to the slave. If the device \
is<br> &gt; floating, no master exists and we triggered a NULL-pointer \
dereference<br> &gt; in XkbPushLockedStateToSlaves.<br>
&gt;<br>
&gt; X.Org Bug 81885 &lt;<a href="http://bugs.freedesktop.org/show_bug.cgi?id=81885" \
target="_blank">http://bugs.freedesktop.org/show_bug.cgi?id=81885</a>&gt;<br> \
&gt;<br> &gt; Signed-off-by: Peter Hutterer &lt;<a href="javascript:;" \
onclick="_e(event, &#39;cvml&#39;, \
&#39;peter.hutterer@who-t.net&#39;)">peter.hutterer@who-t.net</a>&gt;<br> &gt; \
---<br> &gt;   dix/devices.c | 2 +-<br>
&gt;   1 file changed, 1 insertion(+), 1 deletion(-)<br>
&gt;<br>
&gt; diff --git a/dix/devices.c b/dix/devices.c<br>
&gt; index 7f079ff..9e1c546 100644<br>
&gt; --- a/dix/devices.c<br>
&gt; +++ b/dix/devices.c<br>
&gt; @@ -416,7 +416,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)<br>
&gt;               XISendDeviceHierarchyEvent(flags);<br>
&gt;         }<br>
&gt;<br>
&gt; -      if (!IsMaster(dev))<br>
&gt; +      if (!IsMaster(dev) &amp;&amp; !IsFloating(dev))<br>
&gt;               XkbPushLockedStateToSlaves(GetMaster(dev, MASTER_KEYBOARD), 0, \
0);<br> &gt;         RecalculateMasterButtons(dev);<br>
&gt;<br>
&gt; --<br>
&gt; 1.9.3<br>
_______________________________________________<br>
<a href="javascript:;" onclick="_e(event, &#39;cvml&#39;, \
                &#39;xorg-devel@lists.x.org&#39;)">xorg-devel@lists.x.org</a>: X.Org \
                development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" \
                target="_blank">http://lists.x.org/archives/xorg-devel</a><br>
Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" \
target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a><br> \
</blockquote></div>



_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[prev in list] [next in list] [prev in thread] [next in thread]