From 0a2bb03fe20f81dc4cac96d7fe0e4194ae6efffd Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Thu, 13 Aug 2015 01:32:17 -0300
Subject: Linux-libre 4.1.5-gnu

---
 tools/testing/selftests/kdbus/kdbus-util.c   |  9 +++++----
 tools/testing/selftests/kdbus/test-message.c |  2 +-
 tools/testing/selftests/kdbus/test-names.c   | 17 +++++++++++------
 tools/testing/selftests/kdbus/test-sync.c    |  2 +-
 4 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'tools/testing/selftests/kdbus')

diff --git a/tools/testing/selftests/kdbus/kdbus-util.c b/tools/testing/selftests/kdbus/kdbus-util.c
index a5e54ca3a..82fa89b1a 100644
--- a/tools/testing/selftests/kdbus/kdbus-util.c
+++ b/tools/testing/selftests/kdbus/kdbus-util.c
@@ -1155,11 +1155,12 @@ int kdbus_list(struct kdbus_conn *conn, uint64_t flags)
 			if (item->type == KDBUS_ITEM_OWNED_NAME) {
 				n = item->name.name;
 				flags = item->name.flags;
-			}
 
-		kdbus_printf("%8llu flags=0x%08llx conn=0x%08llx '%s'\n",
-			     name->id, (unsigned long long) flags,
-			     name->flags, n);
+				kdbus_printf("%8llu flags=0x%08llx conn=0x%08llx '%s'\n",
+					     name->id,
+					     (unsigned long long) flags,
+					     name->flags, n);
+			}
 	}
 	kdbus_printf("\n");
 
diff --git a/tools/testing/selftests/kdbus/test-message.c b/tools/testing/selftests/kdbus/test-message.c
index ddc1e0af8..563dc8590 100644
--- a/tools/testing/selftests/kdbus/test-message.c
+++ b/tools/testing/selftests/kdbus/test-message.c
@@ -75,7 +75,7 @@ int kdbus_test_message_basic(struct kdbus_test_env *env)
 
 	/* Faked replies with a valid reply cookie are rejected */
 	ret = kdbus_msg_send_reply(conn, time(NULL) ^ cookie, sender->id);
-	ASSERT_RETURN(ret == -EPERM);
+	ASSERT_RETURN(ret == -EBADSLT);
 
 	ret = kdbus_free(conn, offset);
 	ASSERT_RETURN(ret == 0);
diff --git a/tools/testing/selftests/kdbus/test-names.c b/tools/testing/selftests/kdbus/test-names.c
index 66ebb4737..fd4ac5adc 100644
--- a/tools/testing/selftests/kdbus/test-names.c
+++ b/tools/testing/selftests/kdbus/test-names.c
@@ -35,15 +35,20 @@ static int conn_is_name_owner(const struct kdbus_conn *conn,
 		struct kdbus_item *item;
 		const char *n = NULL;
 
-		KDBUS_ITEM_FOREACH(item, name, items)
-			if (item->type == KDBUS_ITEM_OWNED_NAME)
+		KDBUS_ITEM_FOREACH(item, name, items) {
+			if (item->type == KDBUS_ITEM_OWNED_NAME) {
 				n = item->name.name;
 
-		if (name->id == conn->id &&
-		    n && strcmp(needle, n) == 0) {
-			found = true;
-			break;
+				if (name->id == conn->id &&
+				    n && strcmp(needle, n) == 0) {
+					found = true;
+					break;
+				}
+			}
 		}
+
+		if (found)
+			break;
 	}
 
 	ret = kdbus_free(conn, cmd_list.offset);
diff --git a/tools/testing/selftests/kdbus/test-sync.c b/tools/testing/selftests/kdbus/test-sync.c
index e2be910d2..0655a545f 100644
--- a/tools/testing/selftests/kdbus/test-sync.c
+++ b/tools/testing/selftests/kdbus/test-sync.c
@@ -235,7 +235,7 @@ static void *run_thread_reply(void *data)
 
 	/* using an unknown cookie must fail */
 	ret = kdbus_msg_send_reply(conn_a, ~cookie, conn_b->id);
-	if (ret != -EPERM) {
+	if (ret != -EBADSLT) {
 		status = TEST_ERR;
 		goto exit_thread;
 	}
-- 
cgit v1.2.3-54-g00ecf