linux-kernel - [PATCH 21/44] kdbus: Cleanup tests in kdbus_cmd

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <9db47f36656aca616ea01b24bdd615976843093b.1444302968.git.sergei@s15v.net>
Date:	Thu,  8 Oct 2015 14:31:50 +0300
From:	Sergei Zviagintsev <sergei@...v.net>
To:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	Daniel Mack <daniel@...que.org>,
	David Herrmann <dh.herrmann@...glemail.com>,
	Djalal Harouni <tixxdz@...ndz.org>
Cc:	linux-kernel@...r.kernel.org, Sergei Zviagintsev <sergei@...v.net>
Subject: [PATCH 21/44] kdbus: Cleanup tests in kdbus_cmd_send()

Rearrange tests a little to make them look cleaner.

Signed-off-by: Sergei Zviagintsev <sergei@...v.net>
---
 ipc/kdbus/connection.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ipc/kdbus/connection.c b/ipc/kdbus/connection.c
index 93da7f539f74..a4d7414ecaea 100644
--- a/ipc/kdbus/connection.c
+++ b/ipc/kdbus/connection.c
@@ -1977,7 +1977,7 @@ int kdbus_cmd_send(struct kdbus_conn *conn, struct file *f, void __user *argp)
 	ret = kdbus_args_parse(&args, argp, &cmd);
 	if (ret < 0)
 		goto exit;
-	else if (ret > 0 && !cmd->msg_address) /* negotiation without msg */
+	if (ret > 0 && !cmd->msg_address) /* negotiation without msg */
 		goto exit;
 
 	ret2 = kdbus_args_parse_msg(&msg_args, KDBUS_PTR(cmd->msg_address),
@@ -1985,10 +1985,11 @@ int kdbus_cmd_send(struct kdbus_conn *conn, struct file *f, void __user *argp)
 	if (ret2 < 0) { /* cannot parse message */
 		ret = ret2;
 		goto exit;
-	} else if (ret2 > 0 && !ret) { /* msg-negot implies cmd-negot */
-		ret = -EINVAL;
+	}
+	if (ret > 0) /* negotiation */
 		goto exit;
-	} else if (ret > 0) { /* negotiation */
+	if (ret2 > 0) { /* msg-negot implies cmd-negot */
+		ret = -EINVAL;
 		goto exit;
 	}
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/