]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: Replace the ternary conditional operator with min()
authorLu Hongfei <luhongfei@vivo.com>
Sun, 31 Dec 2023 07:12:48 +0000 (16:12 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Jan 2024 14:18:31 +0000 (15:18 +0100)
[ Upstream commit f65fadb0422537d73f9a6472861852dc2f7a6a5b ]

It would be better to replace the traditional ternary conditional
operator with min() in compare_sids.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/smb/server/smbacl.c

index 8fe2592c5525faf12b793c5978f54e2832cb1377..03f19d3de2a179ed38e826b581a593f1ad7723c3 100644 (file)
@@ -97,7 +97,7 @@ int compare_sids(const struct smb_sid *ctsid, const struct smb_sid *cwsid)
        /* compare all of the subauth values if any */
        num_sat = ctsid->num_subauth;
        num_saw = cwsid->num_subauth;
-       num_subauth = num_sat < num_saw ? num_sat : num_saw;
+       num_subauth = min(num_sat, num_saw);
        if (num_subauth) {
                for (i = 0; i < num_subauth; ++i) {
                        if (ctsid->sub_auth[i] != cwsid->sub_auth[i]) {