Added to check validation of pointer

- If packet pointer has invalid address then restart SDBD.

Change-Id: Ieff9343bba35dcfe5122c18ddea60eec615bac76
Signed-off-by: shingil.kang <shingil.kang@samsung.com>

diff --git a/packaging/sdbd.spec b/packaging/sdbd.spec
index a05aff7..826c4f0 100644 (file)
--- a/packaging/sdbd.spec
+++ b/packaging/sdbd.spec
@@ -2,7 +2,7 @@
 
 Name:       sdbd
 Summary:    SDB daemon
-Version:    3.0.10
+Version:    3.0.11
 Release:    0
 License:    Apache-2.0
 Summary:    SDB daemon

diff --git a/packaging/sdbd_device.service b/packaging/sdbd_device.service
index e83b1f7..4fe803f 100644 (file)
--- a/packaging/sdbd_device.service
+++ b/packaging/sdbd_device.service
@@ -7,7 +7,7 @@ After=tmp.mount
 Type=forking
 EnvironmentFile=-/run/tizen-system-env
 PIDFile=/tmp/.sdbd.pid
-RemainAfterExit=yes
+Restart=on-failure
 ExecStart=/usr/sbin/sdbd
 
 [Install]

diff --git a/src/fdevent.c b/src/fdevent.c
index ca1bf3c..2e8a45a 100644 (file)
--- a/src/fdevent.c
+++ b/src/fdevent.c
@@ -50,7 +50,7 @@ static void fatal(const char *fn, const char *fmt, ...)
     fprintf(stderr, "%s:", fn);
     vfprintf(stderr, fmt, ap);
     va_end(ap);
-    abort();
+    exit(-1);
 }
 
 #define FATAL(x...) fatal(__FUNCTION__, x)

diff --git a/src/sdb.c b/src/sdb.c
index 793d8ec..1fbd885 100644 (file)
--- a/src/sdb.c
+++ b/src/sdb.c
@@ -630,6 +630,13 @@ void parse_banner(char *banner, atransport *t)
 
 void handle_packet(apacket *p, atransport *t)
 {
+    // Verify pointer p
+    int result = access((const char *) p, F_OK);
+    if ((result == -1) && (errno == EFAULT)) {
+        D("Invalid apacket = [0x%x]", p);
+        fatal("Invalid apacket = [0x%x]", p);
+    }
+
     asocket *s;
 
     D("handle_packet() %c%c%c%c\n", ((char*) (&(p->msg.command)))[0],

diff --git a/src/transport.c b/src/transport.c
index a697eee..1fe4b9d 100644 (file)
--- a/src/transport.c
+++ b/src/transport.c
@@ -323,6 +323,14 @@ static void *input_thread(void *_t)
                t->serial, t->fd );
             break;
         }
+
+        // Verify pointer p
+        int result = access((const char *) p, F_OK);
+        if ((result == -1) && (errno == EFAULT)) {
+            D("Invalid apacket = [0x%x]", p);
+            fatal("Invalid apacket = [0x%x]", p);
+        }
+
         if(p->msg.command == A_SYNC){
             if(p->msg.arg0 == 0) {
                 D("%s: transport SYNC offline\n", t->serial);