kdbus-test fixes

diff --git a/tools/testing/selftests/kdbus/kdbus-test.c b/tools/testing/selftests/kdbus/kdbus-test.c
index 9f39c8d0ba9f0de1a12f47601f55257cba5ef236..90dbd107cae1193cd19baea5cc2805014b5ad0bd 100644 (file)
--- a/tools/testing/selftests/kdbus/kdbus-test.c
+++ b/tools/testing/selftests/kdbus/kdbus-test.c
@@ -158,14 +158,14 @@ static const struct kdbus_test tests[] = {
                .desc   = "activator message quotas are enforced",
                .func   = kdbus_test_activator_quota,
                .flags  = TEST_CREATE_BUS,
-               .timeout = 60,
+               .timeout = 20,
        },
        {
                .name   = "message-quota",
                .desc   = "message quotas are enforced",
                .func   = kdbus_test_message_quota,
                .flags  = TEST_CREATE_BUS,
-               .timeout = 30,
+               .timeout = 20,
        },
        {
                .name   = "memory-access",
@@ -986,13 +986,16 @@ wur int main(int argc, char *argv[])
                case 'h':
                        usage(argv[0]);
 
-               default:
-                       kdbus_args.tests = (char const * const *)&argv[optind];
-                       if (1 < (kdbus_args.nTests = argc-optind) || !gotT)
-                               kdbus_args.fork = 1;
+               default:;
                }
        }
 
+       if ((kdbus_args.nTests = argc-optind)) {
+               kdbus_args.tests = (char const * const *)&argv[optind];
+               if (1 < kdbus_args.nTests || !gotT)
+                       kdbus_args.fork = 1;
+       }
+
        if (!kdbus_args.root) {
                snprintf(fspath, sizeof(fspath), "/sys/fs/%s",
                         kdbus_args.module);

diff --git a/tools/testing/selftests/kdbus/kdbus-util.c b/tools/testing/selftests/kdbus/kdbus-util.c
index 15ca499ec199119dd8a58423b71bb8dd9073efcc..32bf0cb002da129a81876089776ff378fb9f0473 100644 (file)
--- a/tools/testing/selftests/kdbus/kdbus-util.c
+++ b/tools/testing/selftests/kdbus/kdbus-util.c
@@ -747,8 +747,7 @@ wur int kdbus_msg_dump(const struct kdbus_msg *msg) {
                if (item->size < KDBUS_ITEM_HEADER_SIZE) {
                        kdbus_printf("  +%s (%llu bytes) invalid data record\n",
                                     enum_MSG(item->type), item->size);
-                       ret = -EINVAL;
-                       break;
+                       return -EINVAL;
                }
 
                switch (item->type) {
@@ -1202,13 +1201,12 @@ wur int kdbus_msg_recv(struct kdbus_conn *conn,
 
        msg = (struct kdbus_msg *)(conn->buf + recv.msg.offset);
        ret = kdbus_msg_dump(msg);
+       ASSERT_ZERO(kdbus_msg_verify(msg, conn->attach_flags_recv));
        if (ret < 0) {
                kdbus_msg_free(msg);
                return ret;
        }
 
-       ASSERT_ZERO(kdbus_msg_verify(msg, conn->attach_flags_recv));
-
        if (msg_out) {
                *msg_out = msg;