From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 265EDEB64DC for ; Tue, 11 Jul 2023 20:49:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230490AbjGKUtw (ORCPT ); Tue, 11 Jul 2023 16:49:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbjGKUtr (ORCPT ); Tue, 11 Jul 2023 16:49:47 -0400 Received: from jabberwock.ucw.cz (jabberwock.ucw.cz [46.255.230.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE56E9B; Tue, 11 Jul 2023 13:49:45 -0700 (PDT) Received: by jabberwock.ucw.cz (Postfix, from userid 1017) id 7FF0F1C0AC1; Tue, 11 Jul 2023 22:49:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ucw.cz; s=gen1; t=1689108583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pjvzqHFp8LIfdFXjHOUI6Im7LV07g2ArgXcDiJugfM8=; b=dMl7NkMoZr9kB38vZDHQimokyDUoKjZ6f19n2vmw5fIdTSPZS7qkiu7X0Cx8+9rewDFTwl EdBZ4RNT912YKtcrHQ597FWiZD79aiRc0zEE/T6UknW4+GC45QF1vBVzrVP11n4JRBTXyK 97CD0xQQLUa60aRiwNySkrXg7yQuLz0= Date: Tue, 11 Jul 2023 22:49:43 +0200 From: Pavel Machek To: Sasha Levin Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Shyam Prasad N , kernel test robot , Dan Carpenter , Steve French , pc@cjr.nz, lsahlber@redhat.com, pc@manguebit.com, ematsumiya@suse.de, zhangxiaoxu5@huawei.com, dhowells@redhat.com, brauner@kernel.org, vl@samba.org Subject: Re: [PATCH AUTOSEL 6.1 06/15] cifs: fix sockaddr comparison in iface_cmp Message-ID: References: <20230626215031.179159-1-sashal@kernel.org> <20230626215031.179159-6-sashal@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="PrDF4c4GHgG1I1r/" Content-Disposition: inline In-Reply-To: <20230626215031.179159-6-sashal@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --PrDF4c4GHgG1I1r/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi! > +++ b/fs/cifs/connect.c > @@ -1332,6 +1332,56 @@ cifs_demultiplex_thread(void *p) > module_put_and_kthread_exit(0); > } > =20 > +++ b/fs/cifs/smb2ops.c > @@ -510,6 +510,43 @@ smb3_negotiate_rsize(struct cifs_tcon *tcon, struct = smb3_fs_context *ctx) > return rsize; > } > =20 > +/* > + * compare two interfaces a and b > + * return 0 if everything matches. > + * return 1 if a is rdma capable, or rss capable, or has higher link spe= ed > + * return -1 otherwise. > + */ > +static int > +iface_cmp(struct cifs_server_iface *a, struct cifs_server_iface *b) > +{ > + int cmp_ret =3D 0; > + > + WARN_ON(!a || !b); > + if (a->rdma_capable =3D=3D b->rdma_capable) { > + if (a->rss_capable =3D=3D b->rss_capable) { > + if (a->speed =3D=3D b->speed) { > + cmp_ret =3D cifs_ipaddr_cmp((struct sockaddr *) &a->sockaddr, > + (struct sockaddr *) &b->sockaddr); > + if (!cmp_ret) > + return 0; > + else if (cmp_ret > 0) > + return 1; > + else > + return -1; cifs_ipaddr_cmp already returns 0/1/-1, so this can really be "return cmp_r= et". Best regards, Pavel --=20 People of Russia, stop Putin before his war on Ukraine escalates. --PrDF4c4GHgG1I1r/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRPfPO7r0eAhk010v0w5/Bqldv68gUCZK3AZwAKCRAw5/Bqldv6 8uRHAJwP4r0wJjkrQds9FYH8w/a4U5stQACcCF0ivTGiLDSBXupgRSc9djKk3QU= =c7q1 -----END PGP SIGNATURE----- --PrDF4c4GHgG1I1r/--