Attachment 692459 Details for Bug 907204 – disable signals during startup

[patch] disable signals during startup

sblim-sfcb-1.4.3-disable_signals_during_startup.patch (text/plain), 3.97 KB, created by Vaughan Cao on 2013-02-03 19:10:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vaughan Cao

Created: 2013-02-03 19:10:20 UTC

Size: 3.97 KB

patch

obsolete

>commit 3429a6d00ca9ec7e3c138ddbfcfb767b70bd4301
>Author: nsharoff <nsharoff@nsharoff.(none)>
>Date:   Wed Apr 4 05:34:26 2012 -0700
>
>    [ 3416060 ] SIGSEGV in tool_mm_flush()
>
>If an interrupt occurs at startup, depending on the state of processes,
>segfault can occur. The patch masks signals when processes are starting up
>and enables it back again after that.
>
>(This is cherry-picked from upstream commit 3429a6d00ca9ec7e3c138ddbfcfb767b70bd4301)
>Signed-off-by: Vaughan Cao <vaughan.cao@oracle.com>
>
>diff -Nrup sblim-sfcb-1.3.11.redhat/ChangeLog sblim-sfcb-1.3.11/ChangeLog
>--- sblim-sfcb-1.3.11.redhat/ChangeLog	2011-04-01 05:25:37.000000000 +0800
>+++ sblim-sfcb-1.3.11/ChangeLog	2013-02-01 17:30:50.545120539 +0800
>@@ -1,3 +1,8 @@
>+2012-04-04  Narasimha Sharoff  <nsharoff@us.ibm.com>
>+
>+	* providerDrv.c, providerMgr.c, providerMgr.h, support.c:
>+	[ 3416060 ] SIGSEGV in tool_mm_flush()
>+
> 2011-03-31  Chris Buccella  <buccella@linux.vnet.ibm.com>
> 
> 	* elementCapabiltiesProvider.c:
>diff -Nrup sblim-sfcb-1.3.11.redhat/providerDrv.c sblim-sfcb-1.3.11/providerDrv.c
>--- sblim-sfcb-1.3.11.redhat/providerDrv.c	2013-02-01 17:28:52.091065636 +0800
>+++ sblim-sfcb-1.3.11/providerDrv.c	2013-02-01 17:30:50.547120793 +0800
>@@ -243,7 +243,8 @@ int testStartedProc(int pid, int *left) 
>          stopped=1;
>          (pp+i)->pid=0;
>          info=(pp+i)->firstProv;
>-         pReg->ft->resetProvider(pReg,pid);
>+         if (pReg)
>+            pReg->ft->resetProvider(pReg,pid);
>       }   
>       if ((pp+i)->pid!=0) (*left)++;
>    }
>@@ -722,6 +723,7 @@ static int getProcess(ProviderInfo * inf
>          if (info->pid == 0) {
> 
>             currentProc=getpid();
>+            sigprocmask(SIG_SETMASK, &old_mask, NULL);
>             setSignal(SIGCHLD, SIG_DFL,0);
>             setSignal(SIGTERM, SIG_IGN,0);
>             setSignal(SIGHUP, SIG_IGN,0);
>diff -Nrup sblim-sfcb-1.3.11.redhat/providerMgr.c sblim-sfcb-1.3.11/providerMgr.c
>--- sblim-sfcb-1.3.11.redhat/providerMgr.c	2010-05-18 04:24:08.000000000 +0800
>+++ sblim-sfcb-1.3.11/providerMgr.c	2013-02-01 17:33:34.973018473 +0800
>@@ -931,6 +931,10 @@ void processProviderMgrRequests()
>  
>    _SFCB_ENTER(TRACE_PROVIDERMGR, "processProviderMgrRequests");
> 
>+   /* SF:3416060 disable signals during startup */
>+   sigfillset(&mask);
>+   sigprocmask(SIG_SETMASK, &mask, &old_mask);
>+
>    startUpProvider("root/interop","$ClassProvider$");
> 
> #ifdef SFCB_INCL_INDICATION_SUPPORT
>@@ -941,6 +945,8 @@ void processProviderMgrRequests()
> #endif
> 
>    startUpProvider("root/interop","$ProfileProvider$");
>+
>+   sigprocmask(SIG_SETMASK, &old_mask, NULL);
>       
>    for (;;) {
>       MgrHandler hdlr; 
>@@ -960,8 +966,10 @@ void processProviderMgrRequests()
>            _SFCB_TRACE(1,("--- Mgr request for %s-%s (%d) from %d", req->nameSpace.data,
>                 req->className.data,req->type,requestor));
> 
>+           sigprocmask(SIG_SETMASK, &mask, &old_mask);
>            hdlr = mHandlers[req->type];
>            hdlr.handler(&requestor, req);
>+           sigprocmask(SIG_SETMASK, &old_mask, NULL);
>            
>            _SFCB_TRACE(1,("--- Mgr request for %s-%s DONE", req->nameSpace.data,
>               req->className.data));
>diff -Nrup sblim-sfcb-1.3.11.redhat/providerMgr.h sblim-sfcb-1.3.11/providerMgr.h
>--- sblim-sfcb-1.3.11.redhat/providerMgr.h	2009-12-15 07:07:54.000000000 +0800
>+++ sblim-sfcb-1.3.11/providerMgr.h	2013-02-01 17:30:50.548120920 +0800
>@@ -348,4 +348,6 @@ BinResponseHdr **invokeProviders(BinRequ
> BinResponseHdr *invokeProvider(BinRequestContext * ctx);
> void freeResponseHeaders(BinResponseHdr ** resp, BinRequestContext * ctx);
> 
>+sigset_t mask, old_mask;
>+
> #endif
>diff -Nrup sblim-sfcb-1.3.11.redhat/support.c sblim-sfcb-1.3.11/support.c
>--- sblim-sfcb-1.3.11.redhat/support.c	2013-02-01 17:28:52.091065636 +0800
>+++ sblim-sfcb-1.3.11/support.c	2013-02-01 17:30:50.549121047 +0800
>@@ -714,7 +714,10 @@ int init_sfcBroker()
> 
> int uninit_sfcBroker()
> {
>-   if (pReg) pReg->ft->release(pReg);
>+   if (pReg) {
>+      pReg->ft->release(pReg);
>+      pReg = NULL;
>+   }
>    return 0;
> }
>

Actions: View | Diff

Attachments on bug 907204: 692459 | 692499 | 1132811 | 1136496