Merge ../aio-fixes

8 files changed, 47 insertions, 10 deletions

diff --git a/tools/testing/selftests/cpu-hotplug/Makefile b/tools/testing/selftests/cpu-hotplug/Makefile
index ae5faf9aade2..790c23a9db44 100644
--- a/tools/testing/selftests/cpu-hotplug/Makefile
+++ b/tools/testing/selftests/cpu-hotplug/Makefile
@@ -1,6 +1,6 @@
 all:
 
 run_tests:
-        @/bin/sh ./on-off-test.sh || echo "cpu-hotplug selftests: [FAIL]"
+        @/bin/bash ./on-off-test.sh || echo "cpu-hotplug selftests: [FAIL]"
 
 clean:
diff --git a/tools/testing/selftests/ipc/msgque.c b/tools/testing/selftests/ipc/msgque.c
index aa290c0de6f5..552f0810bffb 100644
--- a/tools/testing/selftests/ipc/msgque.c
+++ b/tools/testing/selftests/ipc/msgque.c
@@ -193,6 +193,11 @@ int main(int argc, char **argv)
         int msg, pid, err;
         struct msgque_data msgque;
 
+        if (getuid() != 0) {
+                printf("Please run the test as root - Exiting.\n");
+                exit(1);
+        }
+
         msgque.key = ftok(argv[0], 822155650);
         if (msgque.key == -1) {
                 printf("Can't make key\n");
diff --git a/tools/testing/selftests/memory-hotplug/Makefile b/tools/testing/selftests/memory-hotplug/Makefile
index 350bfeda3aa8..058c76f5d102 100644
--- a/tools/testing/selftests/memory-hotplug/Makefile
+++ b/tools/testing/selftests/memory-hotplug/Makefile
@@ -1,6 +1,6 @@
 all:
 
 run_tests:
-        @/bin/sh ./on-off-test.sh || echo "memory-hotplug selftests: [FAIL]"
+        @/bin/bash ./on-off-test.sh || echo "memory-hotplug selftests: [FAIL]"
 
 clean:
diff --git a/tools/testing/selftests/powerpc/tm/Makefile b/tools/testing/selftests/powerpc/tm/Makefile
index 51267f4184a6..2cede239a074 100644
--- a/tools/testing/selftests/powerpc/tm/Makefile
+++ b/tools/testing/selftests/powerpc/tm/Makefile
@@ -2,7 +2,7 @@ PROGS := tm-resched-dscr
 
 all: $(PROGS)
 
-$(PROGS):
+$(PROGS): ../harness.c
 
 run_tests: all
         @-for PROG in $(PROGS); do \
diff --git a/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c b/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
index ee98e3886af2..42d4c8caad81 100644
--- a/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
+++ b/tools/testing/selftests/powerpc/tm/tm-resched-dscr.c
@@ -28,6 +28,8 @@
 #include <assert.h>
 #include <asm/tm.h>
 
+#include "utils.h"
+
 #define TBEGIN          ".long 0x7C00051D ;"
 #define TEND            ".long 0x7C00055D ;"
 #define TCHECK          ".long 0x7C00059C ;"
@@ -36,7 +38,8 @@
 #define SPRN_TEXASR     0x82
 #define SPRN_DSCR       0x03
 
-int main(void) {
+int test_body(void)
+{
         uint64_t rv, dscr1 = 1, dscr2, texasr;
 
         printf("Check DSCR TM context switch: ");
@@ -81,10 +84,15 @@ int main(void) {
                 }
                 if (dscr2 != dscr1) {
                         printf(" FAIL\n");
-                        exit(EXIT_FAILURE);
+                        return 1;
                 } else {
                         printf(" OK\n");
-                        exit(EXIT_SUCCESS);
+                        return 0;
                 }
         }
 }
+
+int main(void)
+{
+        return test_harness(test_body, "tm_resched_dscr");
+}
diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile
index 447321104ec0..e775adcbd29f 100644
--- a/tools/thermal/tmon/Makefile
+++ b/tools/thermal/tmon/Makefile
@@ -21,7 +21,7 @@ OBJS = tmon.o tui.o sysfs.o pid.o
 OBJS +=
 
 tmon: $(OBJS) Makefile tmon.h
-        $(CC) ${CFLAGS} $(LDFLAGS) $(OBJS)  -o $(TARGET) -lm -lpanel -lncursesw  -lpthread
+        $(CC) ${CFLAGS} $(LDFLAGS) $(OBJS)  -o $(TARGET) -lm -lpanel -lncursesw -ltinfo -lpthread
 
 valgrind: tmon
          sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET)  1> /dev/null
diff --git a/tools/thermal/tmon/tmon.c b/tools/thermal/tmon/tmon.c
index b30f531173e4..09b7c3218334 100644
--- a/tools/thermal/tmon/tmon.c
+++ b/tools/thermal/tmon/tmon.c
@@ -142,6 +142,7 @@ static void start_syslog(void)
 static void prepare_logging(void)
 {
         int i;
+        struct stat logstat;
 
         if (!logging)
                 return;
@@ -152,6 +153,29 @@ static void prepare_logging(void)
                 return;
         }
 
+        if (lstat(TMON_LOG_FILE, &logstat) < 0) {
+                syslog(LOG_ERR, "Unable to stat log file %s\n", TMON_LOG_FILE);
+                fclose(tmon_log);
+                tmon_log = NULL;
+                return;
+        }
+
+        /* The log file must be a regular file owned by us */
+        if (S_ISLNK(logstat.st_mode)) {
+                syslog(LOG_ERR, "Log file is a symlink.  Will not log\n");
+                fclose(tmon_log);
+                tmon_log = NULL;
+                return;
+        }
+
+        if (logstat.st_uid != getuid()) {
+                syslog(LOG_ERR, "We don't own the log file.  Not logging\n");
+                fclose(tmon_log);
+                tmon_log = NULL;
+                return;
+        }
+
+
         fprintf(tmon_log, "#----------- THERMAL SYSTEM CONFIG -------------\n");
         for (i = 0; i < ptdata.nr_tz_sensor; i++) {
                 char binding_str[33]; /* size of long + 1 */
@@ -331,7 +355,7 @@ static void start_daemon_mode()
         disable_tui();
 
         /* change the file mode mask */
-        umask(0);
+        umask(S_IWGRP | S_IWOTH);
 
         /* new SID for the daemon process */
         sid = setsid();
diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c
index fe1e66b6ef40..a87e99f37c52 100644
--- a/tools/usb/ffs-test.c
+++ b/tools/usb/ffs-test.c
@@ -116,8 +116,8 @@ static const struct {
         .header = {
                 .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC),
                 .length = cpu_to_le32(sizeof descriptors),
-                .fs_count = 3,
-                .hs_count = 3,
+                .fs_count = cpu_to_le32(3),
+                .hs_count = cpu_to_le32(3),
         },
         .fs_descs = {
                 .intf = {