Fix crashing smartcard-daemon

 - restart epoll_wait when is interruped
 - release resource before exit daemon

Change-Id: Id57c4211046ae9e8e69382828298bce169747d8e

diff --git a/common/IPCHelper.cpp b/common/IPCHelper.cpp
index ae368f0..11f7b16 100644 (file)
--- a/common/IPCHelper.cpp
+++ b/common/IPCHelper.cpp
@@ -197,6 +197,7 @@ ERROR :
 #ifdef USE_IPC_EPOLL
                int events = 0;
 
+again :
                if ((events = epoll_wait(fdPoll, pollEvents, EPOLL_SIZE, -1)) > 0)
                {
                        int i;
@@ -218,6 +219,16 @@ ERROR :
                                }
                        }
                }
+               else
+               {
+                       if (errno == EINTR)
+                       {
+                               char buffer[1024];
+
+                               SCARD_DEBUG_ERR("epoll_wait failed [%d], errno [%d], %s", events, errno, strerror_r(errno, buffer, sizeof(buffer)));
+                               goto again;
+                       }
+               }
 #else
                if (select(ipcSocket + 1, &fdSetRead, NULL, NULL, NULL) > 0)
                {

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index 841932a..6b65206 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -1,6 +1,6 @@
 Name:       smartcard-service
 Summary:    Smartcard Service FW
-Version:    0.1.14
+Version:    0.1.15
 Release:    0
 Group:      libs
 License:    Apache License, Version 2.0

diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp
index abcc162..4f738fa 100644 (file)
--- a/server/ServerResource.cpp
+++ b/server/ServerResource.cpp
@@ -895,27 +895,30 @@ namespace smartcard_service_api
 
        void ServerResource::unloadSecureElements()
        {
-               size_t i;
-               map<unsigned int, Terminal *>::iterator item;
-
-               for (item = mapTerminals.begin(); item != mapTerminals.end(); item++)
+               if (seLoaded == true)
                {
-                       item->second->finalize();
+                       size_t i;
+                       map<unsigned int, Terminal *>::iterator item;
 
-                       IntegerHandle::releaseHandle(item->first);
-               }
+                       for (item = mapTerminals.begin(); item != mapTerminals.end(); item++)
+                       {
+                               item->second->finalize();
+
+                               IntegerHandle::releaseHandle(item->first);
+                       }
 
-               mapTerminals.clear();
+                       mapTerminals.clear();
 
-               for (i = 0; i < libraries.size(); i++)
-               {
-                       if (libraries[i] != NULL)
-                               dlclose(libraries[i]);
-               }
+                       for (i = 0; i < libraries.size(); i++)
+                       {
+                               if (libraries[i] != NULL)
+                                       dlclose(libraries[i]);
+                       }
 
-               libraries.clear();
+                       libraries.clear();
 
-               seLoaded = false;
+                       seLoaded = false;
+               }
        }
 
        bool ServerResource::isValidReaderHandle(unsigned int reader)

diff --git a/server/smartcard-daemon.cpp b/server/smartcard-daemon.cpp
index aade018..4309bab 100644 (file)
--- a/server/smartcard-daemon.cpp
+++ b/server/smartcard-daemon.cpp
@@ -233,5 +233,8 @@ int main()
 #ifdef USE_AUTOSTART
        _finalize_dbus();
 #endif
+       /* release secure element.. (pure virtual function problem..) */
+       ServerResource::getInstance().unloadSecureElements();
+
        return 0;
 }