netdev - [PATCH] VSOCK: remove unnecessary ternary operator on return value

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-next>] [day] [month] [year] [list]

Message-Id: <20170328155424.22873-1-colin.king@canonical.com>
Date:   Tue, 28 Mar 2017 16:54:24 +0100
From:   Colin King <colin.king@...onical.com>
To:     "David S . Miller" <davem@...emloft.net>,
        Jorgen Hansen <jhansen@...are.com>,
        Adit Ranadive <aditr@...are.com>,
        Julia Lawall <julia.lawall@...6.fr>,
        Stefan Hajnoczi <stefanha@...hat.com>, netdev@...r.kernel.org
Cc:     kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] VSOCK: remove unnecessary ternary operator on return value

From: Colin Ian King <colin.king@...onical.com>

Rather than assign the positive errno values to ret and then
checking if it is positive and flip the sign, just set ret to
be the -ve errno value.

Detected by CoverityScan, CID#986649 ("Logically Dead Code")

Signed-off-by: Colin Ian King <colin.king@...onical.com>
---
 net/vmw_vsock/vmci_transport.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 4be4fbbc0b50..a68cd6b0fb72 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -100,27 +100,27 @@ static s32 vmci_transport_error_to_vsock_error(s32 vmci_error)
 
 	switch (vmci_error) {
 	case VMCI_ERROR_NO_MEM:
-		err = ENOMEM;
+		err = -ENOMEM;
 		break;
 	case VMCI_ERROR_DUPLICATE_ENTRY:
 	case VMCI_ERROR_ALREADY_EXISTS:
-		err = EADDRINUSE;
+		err = -EADDRINUSE;
 		break;
 	case VMCI_ERROR_NO_ACCESS:
-		err = EPERM;
+		err = -EPERM;
 		break;
 	case VMCI_ERROR_NO_RESOURCES:
-		err = ENOBUFS;
+		err = -ENOBUFS;
 		break;
 	case VMCI_ERROR_INVALID_RESOURCE:
-		err = EHOSTUNREACH;
+		err = -EHOSTUNREACH;
 		break;
 	case VMCI_ERROR_INVALID_ARGS:
 	default:
-		err = EINVAL;
+		err = -EINVAL;
 	}
 
-	return err > 0 ? -err : err;
+	return err;
 }
 
 static u32 vmci_transport_peer_rid(u32 peer_cid)
-- 
2.11.0