From 3ea25e32754ff7eb269882ff3c799a477773a76e Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Thu, 9 Jan 2014 08:14:22 +0800
Subject: [PATCH] names: switch locking order

---
 names.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/names.c b/names.c
index af6c225..39327e2 100644
--- a/names.c
+++ b/names.c
@@ -820,8 +820,8 @@ int kdbus_cmd_name_list(struct kdbus_name_registry *reg,
 	if (IS_ERR(cmd_list))
 		return PTR_ERR(cmd_list);
 
-	mutex_lock(&conn->ep->bus->lock);
 	mutex_lock(&reg->entries_lock);
+	mutex_lock(&conn->ep->bus->lock);
 
 	/* size of header */
 	size = sizeof(struct kdbus_name_list);
@@ -858,8 +858,8 @@ exit_pool_free:
 	if (ret < 0)
 		kdbus_pool_free_range(conn->pool, off);
 exit_unlock:
-	mutex_unlock(&reg->entries_lock);
 	mutex_unlock(&conn->ep->bus->lock);
+	mutex_unlock(&reg->entries_lock);
 	kfree(cmd_list);
 
 	return ret;
-- 
2.34.1