netdev - [PATCH net-next 4/8] libceph: use min() to simplify the code

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20240822133908.1042240-5-lizetao1@huawei.com>
Date: Thu, 22 Aug 2024 21:39:04 +0800
From: Li Zetao <lizetao1@...wei.com>
To: <davem@...emloft.net>, <edumazet@...gle.com>, <kuba@...nel.org>,
	<pabeni@...hat.com>, <marcel@...tmann.org>, <johan.hedberg@...il.com>,
	<luiz.dentz@...il.com>, <idryomov@...il.com>, <xiubli@...hat.com>,
	<dsahern@...nel.org>, <trondmy@...nel.org>, <anna@...nel.org>,
	<chuck.lever@...cle.com>, <jlayton@...nel.org>, <neilb@...e.de>,
	<okorniev@...hat.com>, <Dai.Ngo@...cle.com>, <tom@...pey.com>,
	<jmaloy@...hat.com>, <ying.xue@...driver.com>, <lizetao1@...wei.com>,
	<linux@...blig.org>, <jacob.e.keller@...el.com>, <willemb@...gle.com>,
	<kuniyu@...zon.com>, <wuyun.abel@...edance.com>, <quic_abchauha@...cinc.com>,
	<gouhao@...ontech.com>
CC: <netdev@...r.kernel.org>, <linux-bluetooth@...r.kernel.org>,
	<ceph-devel@...r.kernel.org>, <linux-nfs@...r.kernel.org>,
	<tipc-discussion@...ts.sourceforge.net>
Subject: [PATCH net-next 4/8] libceph: use min() to simplify the code

When resolving name in ceph_dns_resolve_name(), the end address of name
is determined by the minimum value of delim_p and colon_p. So using min()
here is more in line with the context.

Signed-off-by: Li Zetao <lizetao1@...wei.com>
---
 net/ceph/messenger.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 3c8b78d9c4d1..d1b5705dc0c6 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -1254,7 +1254,7 @@ static int ceph_dns_resolve_name(const char *name, size_t namelen,
 	colon_p = memchr(name, ':', namelen);
 
 	if (delim_p && colon_p)
-		end = delim_p < colon_p ? delim_p : colon_p;
+		end = min(delim_p, colon_p);
 	else if (!delim_p && colon_p)
 		end = colon_p;
 	else {
-- 
2.34.1