sens: use strncat and strncpy when composing the command buffer

[android-x86/hardware-intel-libsensors.git] / sens.c

diff --git a/sens.c b/sens.c
index a133341..c47d21b 100644 (file)
--- a/sens.c
+++ b/sens.c
@@ -15,7 +15,7 @@
 
 int usage(void)
 {
-       fprintf(stderr, "sens start hal.so\n");
+       fprintf(stderr, "sens start [sensors.gmin.so]\n");
        fprintf(stderr, "sens [activate | deactivate] sensor_id\n");
        fprintf(stderr, "sens set_delay sensor_id delay\n");
        fprintf(stderr, "sens poll\n");
@@ -407,13 +407,36 @@ static int start_server(void)
        }
 }
 
-static int start_hal(const char *hal_path)
+static const char *hal_paths[] = {
+       "/system/lib/hw/sensors.gmin.so",
+       "sensors.gmin.so",
+       "/lib/sensors.gmin.so",
+};
+
+static int start_hal(int argc, char **argv)
 {
        void *hal;
        pid_t child;
        int err;
        pthread_t sensors_thread;
+       const char *hal_path = NULL;
+
+       if (argc == 2) {
+               unsigned i;
+
+               for(i = 0; i < sizeof(hal_paths)/sizeof(const char*); i++) {
+                       if (!access(hal_paths[i], R_OK)) {
+                               hal_path = hal_paths[i];
+                               break;
+                       }
+               }
 
+               if (!hal_path) {
+                       fprintf(stderr, "unable to find HAL\n");
+                       exit(1);
+               }
+       } else
+               hal_path = argv[2];
 
        hal = dlopen(hal_path, RTLD_NOW);
        if (!hal) {
@@ -500,15 +523,19 @@ int main(int argc, char **argv)
        }
 
        if (!strcmp(argv[1], "start")) {
-               if (argc < 3)
+               if (argc < 2)
                        return usage();
 
-               return start_hal(argv[2]);
+               return start_hal(argc, argv);
        }
 
-       strcpy(cmd, argv[1]); strcat(cmd, " ");
+       if (strlen(argv[1]) >= sizeof(cmd))
+               return usage();
+       strncpy(cmd, argv[1], sizeof(cmd) - 1);
+       strncat(cmd, " ", sizeof(cmd) - strlen(cmd) - 1);
        for(i = 2; i < argc; i++) {
-               strcat(cmd, argv[i]); strcat(cmd, " ");
+               strncat(cmd, argv[i], sizeof(cmd) - strlen(cmd) - 1);
+               strncat(cmd, " ", sizeof(cmd) - strlen(cmd) - 1);
        }
 
        sock = socket(AF_UNIX, SOCK_SEQPACKET, 0);