[xf86-input-mouse] Fix "attempting to log data in a signal unsafe manner" warning

Submitted by Markus Trippelsdorf on Aug. 31, 2012, 4:13 p.m.

Details

Message ID 20120831161307.GA263@x4
State Superseded
Headers show

Not browsing as part of any series.

Commit Message

Markus Trippelsdorf Aug. 31, 2012, 4:13 p.m.
(EE) BUG: triggered 'if (inSignalContext)'
(EE) BUG: /var/tmp/portage/x11-base/xorg-server-1.12.99.905/work/xorg-server-1.12.99.905/os/log.c:472 in LogVMessageVerb()
(EE) Warning: attempting to log data in a signal unsafe manner while in signal context. Please update to check inSignalContext and/or use LogMessageV
erbSigSafe() or ErrorFSigSafe(). The offending log format message is:
3rd Button detected: disabling emulate3Button

(EE) 
(EE) Backtrace:
(EE) 0: /usr/bin/X (xorg_backtrace+0x36) [0x57ef76]
(EE) 1: /usr/bin/X (LogVMessageVerb+0x64) [0x5897c4]
(EE) 2: /usr/bin/X (xf86Msg+0x8f) [0x47e20f]
(EE) 3: /usr/lib64/xorg/modules/input/mouse_drv.so (0x7f4d66caf000+0x6fda) [0x7f4d66cb5fda]
...

Patch hide | download patch | download mbox

diff --git a/src/mouse.c b/src/mouse.c
index b65ea0e..b91efc3 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -2046,7 +2046,7 @@  Emulate3ButtonsSoft(InputInfoPtr pInfo)
     if (!pMse->emulate3ButtonsSoft)
         return TRUE;
 
-    xf86Msg(X_INFO,"3rd Button detected: disabling emulate3Button\n");
+    LogMessageVerbSigSafe(X_INFO,0,"3rd Button detected: disabling emulate3Button\n");
 
     Emulate3ButtonsSetEnabled(pInfo, FALSE);
 

Comments

On 08/31/2012 09:13 AM, Markus Trippelsdorf wrote:
> (EE) BUG: triggered 'if (inSignalContext)'
> (EE) BUG: /var/tmp/portage/x11-base/xorg-server-1.12.99.905/work/xorg-server-1.12.99.905/os/log.c:472 in LogVMessageVerb()
> (EE) Warning: attempting to log data in a signal unsafe manner while in signal context. Please update to check inSignalContext and/or use LogMessageV
> erbSigSafe() or ErrorFSigSafe(). The offending log format message is:
> 3rd Button detected: disabling emulate3Button
>
> (EE)
> (EE) Backtrace:
> (EE) 0: /usr/bin/X (xorg_backtrace+0x36) [0x57ef76]
> (EE) 1: /usr/bin/X (LogVMessageVerb+0x64) [0x5897c4]
> (EE) 2: /usr/bin/X (xf86Msg+0x8f) [0x47e20f]
> (EE) 3: /usr/lib64/xorg/modules/input/mouse_drv.so (0x7f4d66caf000+0x6fda) [0x7f4d66cb5fda]
> ...
>
> diff --git a/src/mouse.c b/src/mouse.c
> index b65ea0e..b91efc3 100644
> --- a/src/mouse.c
> +++ b/src/mouse.c
> @@ -2046,7 +2046,7 @@ Emulate3ButtonsSoft(InputInfoPtr pInfo)
>       if (!pMse->emulate3ButtonsSoft)
>           return TRUE;
>
> -    xf86Msg(X_INFO,"3rd Button detected: disabling emulate3Button\n");
> +    LogMessageVerbSigSafe(X_INFO,0,"3rd Button detected: disabling emulate3Button\n");
>
>       Emulate3ButtonsSetEnabled(pInfo, FALSE);
>

Yay! Our first sigsafe log fix submission by someone other than Peter 
and I :). Let me reach into my bag of prizes....

Oooh look! I pulled out a brand spanking new tag!

Reviewed-by: Chase Douglas <chase.douglas@canonical.com>

This tag has an MSRP of $760,000! Enjoy! Please do spend it all in one 
place, however, preferably on this specific patch.

Seriously though, thank you very much for noting the message and helping 
fix it :).

-- Chase
On 08/31/12 09:13 AM, Markus Trippelsdorf wrote:
> (EE) BUG: triggered 'if (inSignalContext)'
> (EE) BUG: /var/tmp/portage/x11-base/xorg-server-1.12.99.905/work/xorg-server-1.12.99.905/os/log.c:472 in LogVMessageVerb()
> (EE) Warning: attempting to log data in a signal unsafe manner while in signal context. Please update to check inSignalContext and/or use LogMessageV
> erbSigSafe() or ErrorFSigSafe(). The offending log format message is:
> 3rd Button detected: disabling emulate3Button
> 
> (EE) 
> (EE) Backtrace:
> (EE) 0: /usr/bin/X (xorg_backtrace+0x36) [0x57ef76]
> (EE) 1: /usr/bin/X (LogVMessageVerb+0x64) [0x5897c4]
> (EE) 2: /usr/bin/X (xf86Msg+0x8f) [0x47e20f]
> (EE) 3: /usr/lib64/xorg/modules/input/mouse_drv.so (0x7f4d66caf000+0x6fda) [0x7f4d66cb5fda]
> ...
> 
> diff --git a/src/mouse.c b/src/mouse.c
> index b65ea0e..b91efc3 100644
> --- a/src/mouse.c
> +++ b/src/mouse.c
> @@ -2046,7 +2046,7 @@ Emulate3ButtonsSoft(InputInfoPtr pInfo)
>      if (!pMse->emulate3ButtonsSoft)
>          return TRUE;
>  
> -    xf86Msg(X_INFO,"3rd Button detected: disabling emulate3Button\n");
> +    LogMessageVerbSigSafe(X_INFO,0,"3rd Button detected: disabling emulate3Button\n");

I was about to push, but then wondered: does that need to be in an #if for the
new ABI version containing that function?