Received-SPF: pass (google.com: domain of linux-nfs+bounces-24-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 21 Nov 2023 22:15:12 +0100
From: 
	Ahelenia =?utf-8?Q?Ziemia=C5=84ska?= <nabijaczleweli@nabijaczleweli.xyz>
To: linux-nfs@vger.kernel.org, NeilBrown <neilb@suse.de>, 
	Steve Dickson <steved@redhat.com>
Subject: [PATCH nfs-utils v2 2/2] testlk: format off_t as llong instead of
 ssize_t
Message-ID: <9d2b8bdc146a1fb48b391ae1adda0b6249ba9c5b.1700601199.git.nabijaczleweli@nabijaczleweli.xyz>
References: <b38ecca96762d939d377c381bf34521ee5945129.1700601199.git.nabijaczleweli@nabijaczleweli.xyz>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="gxkx66smp4tdocgz"
Content-Disposition: inline
In-Reply-To: <b38ecca96762d939d377c381bf34521ee5945129.1700601199.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103


--gxkx66smp4tdocgz
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

This, naturally, produces a warning on x32 (and other ILP32 platforms
with 64-bit off_t, presumably, but you need to ask for it explicitly
there usually):
gcc -DHAVE_CONFIG_H -I. -I../../support/include  -D_GNU_SOURCE -Wdate-time =
-D_FORTIFY_SOURCE=3D2 -D_GNU_SOURCE -g -O2 -ffile-prefix-map=3D/tmp/nfs-uti=
ls-2.6.3=3D. -specs=3D/usr/share/dpkg/pie-compile.specs -fstack-protector-s=
trong -Wformat -Werror=3Dformat-security -g -O2 -ffile-prefix-map=3D/tmp/nf=
s-utils-2.6.3=3D. -specs=3D/usr/share/dpkg/pie-compile.specs -fstack-protec=
tor-strong -Wformat -Werror=3Dformat-security -c -o testlk-testlk.o `test -=
f 'testlk.c' || echo './'`testlk.c
testlk.c: In function =E2=80=98main=E2=80=99:
testlk.c:84:66: warning: format =E2=80=98%zd=E2=80=99 expects argument of t=
ype =E2=80=98signed size_t=E2=80=99, but argument 4 has type =E2=80=98__off=
_t=E2=80=99 {aka =E2=80=98long long int=E2=80=99} [-Wformat=3D]
   84 |                         printf("%s: conflicting lock by %d on (%zd;=
%zd)\n",
      |                                                                ~~^
      |                                                                  |
      |                                                                  int
      |                                                                %lld
   85 |                                 fname, fl.l_pid, fl.l_start, fl.l_l=
en);
      |                                                  ~~~~~~~~~~
      |                                                    |
      |                                                    __off_t {aka lon=
g long int}
testlk.c:84:70: warning: format =E2=80=98%zd=E2=80=99 expects argument of t=
ype =E2=80=98signed size_t=E2=80=99, but argument 5 has type =E2=80=98__off=
_t=E2=80=99 {aka =E2=80=98long long int=E2=80=99} [-Wformat=3D]
   84 |                         printf("%s: conflicting lock by %d on (%zd;=
%zd)\n",
      |                                                                    =
~~^
      |                                                                    =
  |
      |                                                                    =
  int
      |                                                                    =
%lld
   85 |                                 fname, fl.l_pid, fl.l_start, fl.l_l=
en);
      |                                                              ~~~~~~=
~~
      |                                                                |
      |                                                                __of=
f_t {aka long long int}

Upcast to long long, doesn't really matter.

It does, of course, raise the question of whether other bits of
nfs-utils do something equally broken that just isn't caught by the
format validator.

Signed-off-by: Ahelenia Ziemia=C5=84ska <nabijaczleweli@nabijaczleweli.xyz>
---
Same as v1: <44adec629186e220ee5d8fd936980ac4a33dc510.1693754442.git.nabija=
czleweli@nabijaczleweli.xyz>

 tools/locktest/testlk.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/locktest/testlk.c b/tools/locktest/testlk.c
index ea51f788..c9bd6bac 100644
--- a/tools/locktest/testlk.c
+++ b/tools/locktest/testlk.c
@@ -81,8 +81,8 @@ main(int argc, char **argv)
 		if (fl.l_type =3D=3D F_UNLCK) {
 			printf("%s: no conflicting lock\n", fname);
 		} else {
-			printf("%s: conflicting lock by %d on (%zd;%zd)\n",
-				fname, fl.l_pid, fl.l_start, fl.l_len);
+			printf("%s: conflicting lock by %d on (%lld;%lld)\n",
+				fname, fl.l_pid, (long long)fl.l_start, (long long)fl.l_len);
 		}
 		return 0;
 	}
--=20
2.39.2

--gxkx66smp4tdocgz
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmVdHd8ACgkQvP0LAY0m
WPEiqw//ePjCClOu9oYids8fkvHnwrLOu5bqLbsEHCKNSCp1h586XOAW4wG9CzsE
Sy2dKCi0LVwuNUMpi1awog9TQvGE27LA/EImgbK/RjLQOiIiUmYZ230k/DK+jiFq
HmOgcuCaKN2G8xnDlkuLeSbJ7xCz0HSeMb1+G6BTCLmGJLPxKsC+E6axFN72cCc2
Wrn08n1OL6/EC61VKa0bNhEAWxVn3Atn4j2c+IfgwuEFbccny2ay2Nsxj0xw5M+D
7rqC82VHc/IdvxLXaOzhJqgMpFEbY98cZff/hb8p2vDCPFIMhfjD8qXFAstZ75Di
wYB7padx/BqNk7+9mPMhHe/sSXGqubyI2LMep3PobrWE6q8Mu6OxmRT2aa31yJJA
qpXiy/MTE3JWlv1l+kOuZdeM3gylLH+4M/hjuXMzHCeAtdvTcDsJpB2Y3HiF+JVy
EoDiA65mc1WnxVpWipiHQhscU9CIzlRAI2c2v1eN6OvsaF/l0QBCUnbZWDmFPLh7
3zSoEb4Mg3pkSZadz+yNKRurUtNFmLZzSsWBNjXfWZf/EQr4eBQYoGUs2wd8PmhC
pkpQD6kjLVUXTJ+zI8AAL4xQzi1u2fPqwVtxWXkCZGTzXGp/ovmRYc4vsu2/Auwl
Sttrn/YbCh+3Ye4cIoWN7i5pXdSfkawP+XtRS6ZDLoVWtEPTJoA=
=fc2/
-----END PGP SIGNATURE-----

--gxkx66smp4tdocgz--