From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12942 Path: news.gmane.org!.POSTED!not-for-mail From: Matthias Schiffer Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH] sys/socket.h: fix SO_PEERSEC value on MIPS Date: Tue, 26 Jun 2018 22:20:53 +0200 Message-ID: References: <4e0877a604bad684be020f68e96a05156131fd44.1529853403.git.mschiffer@universe-factory.net> <20180624153019.GT1392@brightrain.aerifal.cx> <21de6b7c-21d4-ad8c-8680-e26e968e4316@universe-factory.net> <1e699a6f-22b8-83fc-9ef4-04b2ad8542f2@universe-factory.net> <20180626200525.GV1392@brightrain.aerifal.cx> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="bGYF8yS29TFVuVT2TJ3HOnORGLL6QPhdQ" X-Trace: blaine.gmane.org 1530044335 422 195.159.176.226 (26 Jun 2018 20:18:55 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 26 Jun 2018 20:18:55 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 To: musl@lists.openwall.com Original-X-From: musl-return-12958-gllmg-musl=m.gmane.org@lists.openwall.com Tue Jun 26 22:18:51 2018 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1fXuQM-0008Ry-H3 for gllmg-musl@m.gmane.org; Tue, 26 Jun 2018 22:18:50 +0200 Original-Received: (qmail 15858 invoked by uid 550); 26 Jun 2018 20:20:59 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 15837 invoked from network); 26 Jun 2018 20:20:58 -0000 Openpgp: preference=signencrypt Autocrypt: addr=mschiffer@universe-factory.net; prefer-encrypt=mutual; keydata= xsFNBFLNIUUBEADtyPGKZY/BVjqAp68oV5xpY557+KDgXN4jDrdtANDDMjIDakbXAD1A1zqX LUREvXMsKA/vacGF2I4/0kwsQhNeOzhGPsBa8y785WFQjxq4LsBJpC4QfDvcheIl4BeKoHzf UYDp4hgPBrKcaRRoBODMwp1FZmJxhRVtiQ2m6piemksF1Wpx+6wZlcw4YhQdEnw7QZByYYgA Bv7ZoxSQZzyeR/Py0G5/zg9ABLcTF56UWq+ZkiLEMg/5K5hzUKLYC4h/xNV58mNHBho0k/D4 jPmCjXy7bouDzKZjnu+CIsMoW9RjGH393GNCc+F3Xuo35g3L4lZ89AdNhZ0zeMLJCTx5uYOQ N5YZP2eHW2PlVZpwtDOR0zWoy1c0q6DniYtn0HGStVLuP+MQxuRe2RloJE7fDRfz7/OfOU6m BVkRyMCCPwWYXyEs2y8m4akXDvBCPTNMMEPRIy3qcAN4HnOrmnc24qfQzYp9ajFt1YrXMqQy SQgcTzuVYkYVnEMFBhN6P2EKoKU+6Mee01UFb7Ww8atiqG3U0oxsXbOIVLrrno6JONdYeAvy YuZbAxJivU3/RkGLSygZV53EUCfyoNldDuUL7Gujtn/R2/CsBPM+RH8oOVuh3od2Frf0PP8p 9yYoa2RD7PfX4WXdNfYv0OWgFgpz0leup9xhoUNE9RknpbLlUwARAQABzTJNYXR0aGlhcyBT Y2hpZmZlciA8bXNjaGlmZmVyQHVuaXZlcnNlLWZhY3RvcnkubmV0PsLBlwQTAQoAQQIbAwUL CQgH In-Reply-To: <20180626200525.GV1392@brightrain.aerifal.cx> Xref: news.gmane.org gmane.linux.lib.musl.general:12942 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --bGYF8yS29TFVuVT2TJ3HOnORGLL6QPhdQ Content-Type: multipart/mixed; boundary="GPmBkdT0mw0Toh9ocbmaWM2zXYhJOgebF"; protected-headers="v1" From: Matthias Schiffer To: musl@lists.openwall.com Message-ID: Subject: Re: [musl] [PATCH] sys/socket.h: fix SO_PEERSEC value on MIPS References: <4e0877a604bad684be020f68e96a05156131fd44.1529853403.git.mschiffer@universe-factory.net> <20180624153019.GT1392@brightrain.aerifal.cx> <21de6b7c-21d4-ad8c-8680-e26e968e4316@universe-factory.net> <1e699a6f-22b8-83fc-9ef4-04b2ad8542f2@universe-factory.net> <20180626200525.GV1392@brightrain.aerifal.cx> In-Reply-To: <20180626200525.GV1392@brightrain.aerifal.cx> --GPmBkdT0mw0Toh9ocbmaWM2zXYhJOgebF Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 06/26/2018 10:05 PM, Rich Felker wrote: > On Tue, Jun 26, 2018 at 08:21:38PM +0200, Matthias Schiffer wrote: >> On 06/25/2018 07:52 PM, Matthias Schiffer wrote: >>> On 06/24/2018 05:30 PM, Rich Felker wrote: >>>> On Sun, Jun 24, 2018 at 05:18:39PM +0200, Matthias Schiffer wrote: >>>>> Differing from all other archs supported by musl, MIPS defines SO_P= EERSEC >>>>> to 30 instead of 31. >>>>> >>>>> Reported-by: Andrey Jr. Mlenikov >>>>> --- >>>>> arch/mips/bits/socket.h | 2 ++ >>>>> arch/mips64/bits/socket.h | 2 ++ >>>>> arch/mipsn32/bits/socket.h | 2 ++ >>>>> include/sys/socket.h | 3 +++ >>>>> 4 files changed, 9 insertions(+) >>>>> >>>>> diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h >>>>> index 191ebdb5a418..39c42b822ac3 100644 >>>>> --- a/arch/mips/bits/socket.h >>>>> +++ b/arch/mips/bits/socket.h >>>>> @@ -48,5 +48,7 @@ struct cmsghdr { >>>>> #define SO_SNDBUFFORCE 31 >>>>> #define SO_RCVBUFFORCE 33 >>>>> =20 >>>>> +#define SO_PEERSEC 30 >>>>> + >>>>> #define SOCK_NONBLOCK 0200 >>>>> #define SOCK_CLOEXEC 02000000 >>>>> diff --git a/arch/mips64/bits/socket.h b/arch/mips64/bits/socket.h >>>>> index cf801797beb0..39b764df4c62 100644 >>>>> --- a/arch/mips64/bits/socket.h >>>>> +++ b/arch/mips64/bits/socket.h >>>>> @@ -64,5 +64,7 @@ struct cmsghdr { >>>>> #define SO_SNDBUFFORCE 31 >>>>> #define SO_RCVBUFFORCE 33 >>>>> =20 >>>>> +#define SO_PEERSEC 30 >>>>> + >>>>> #define SOCK_NONBLOCK 0200 >>>>> #define SOCK_CLOEXEC 02000000 >>>>> diff --git a/arch/mipsn32/bits/socket.h b/arch/mipsn32/bits/socket.= h >>>>> index 191ebdb5a418..39c42b822ac3 100644 >>>>> --- a/arch/mipsn32/bits/socket.h >>>>> +++ b/arch/mipsn32/bits/socket.h >>>>> @@ -48,5 +48,7 @@ struct cmsghdr { >>>>> #define SO_SNDBUFFORCE 31 >>>>> #define SO_RCVBUFFORCE 33 >>>>> =20 >>>>> +#define SO_PEERSEC 30 >>>>> + >>>>> #define SOCK_NONBLOCK 0200 >>>>> #define SOCK_CLOEXEC 02000000 >>>>> diff --git a/include/sys/socket.h b/include/sys/socket.h >>>>> index 507da5cc2a40..6b6cf2fc3988 100644 >>>>> --- a/include/sys/socket.h >>>>> +++ b/include/sys/socket.h >>>>> @@ -203,7 +203,10 @@ struct linger { >>>>> #define SO_TIMESTAMP 29 >>>>> #define SCM_TIMESTAMP SO_TIMESTAMP >>>>> =20 >>>>> +#ifndef SO_PEERSEC >>>>> #define SO_PEERSEC 31 >>>>> +#endif >>>>> + >>>>> #define SO_PASSSEC 34 >>>>> #define SO_TIMESTAMPNS 35 >>>>> #define SCM_TIMESTAMPNS SO_TIMESTAMPNS >>>>> --=20 >>>>> 2.18.0 >>>> >>>> Should we perhaps do this under the SO_DEBUG conditional like all th= e >>>> other SO_* that vary by arch? Doing so would require adding >>>> definitions to the other weird archs (ibm ones) but might be cleaner= >>>> in the top-level header -- I'm not sure. >>>> >>>> Rich >>>> >>> >>> >>> That would actually make sense. I did not research what SO_PEERSEC ev= en is >>> before I sent the patch; only know I noticed that both the constants >>> defined under SO_DEBUG and the others below the #endif are SOL_SOCKET= , so >>> it would be more consistent to move it under SO_DEBUG as well. >> >> Should I send an updated patch, or are you going to fix it up yourself= ? >=20 > I'm doing it now. Thanks. I think we're going to find that there are > more SO_* that might vary by arch, especially if we ever add sparc. >=20 > What I'd kind of like to eventually do is get rid of the definitions > in sys/socket.h itself and always have them all in bits, with most > archs sharing the arch/generic version of the bits header. However > that doesn't work with the current bits/socket.h since the generic > definitions of msghdr and cmsghdr don't work on 64-bit. Perhaps we > should introduce a new bits/sockopt.h (but this imposes an extra file > open/parse for every #include ) or find some way to > avoid the gratuitous difference (maybe alltypes.h could somehow > provide padding definitions for a generic definition of [c]msghdr to > use). >=20 > Anyway I won't delay the immediate bugfix with what-ifs about future > direction. >=20 > Rich >=20 Thanks. It seems you missed to add SO_PEERSEC to powerpc{,64} and s390x though, which also define SO_DEBUG. Matthias --GPmBkdT0mw0Toh9ocbmaWM2zXYhJOgebF-- --bGYF8yS29TFVuVT2TJ3HOnORGLL6QPhdQ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEZmTnvaa2aYgexS51Fu8/ZMsgHZwFAlsyoCUACgkQFu8/ZMsg HZxVIxAAy1WRwyks4yM1RYRXwgxHqJD3QWlVUsH/ahkTxWVGNrsy+9n6qamtWzQ+ /oFJPloLtbUhJw1+sXqxPo5mwyDdO6mSWolQxqHQCcz9OnbhW7myZ4VMui75O0Y0 F0YMCsipS5IcG9X5+31FNbHt6AoLphJbsS9VB43TVwNe0WV2FziGQlK0i0ClvQ1R doToMK7AtvdtRpWlQd/+fqA7dO/qfmFTE37K6hm35PXm5lnktH3n7wxQWS3eCZ0M /9HG8usYpI74dBQDU/cXeKMJHyZucfPlqHwFuF3D9SLyZsPG1P2t9jGV9O3ZCKB+ 940VmKcK8wtFZeW8oFn1MjRpeLMskEkf2wXEdeb4YtQuTUwK/RGJQwAExrTfgniK PaGE0Nq2md2FEDaomXClDLAxjd5ODqU5ZLx0tBp3C5PcPJHjMLjqsj86ynUZws2F rGF/HY7cyjMvChzIGLguvQ5d9xglb8Rf4XeyHcpoim2NIQMpJHSFSFAY6rvOn0FN lFf8cy89gf58hjgbAz7SGxCgQ9aEOc9JwTmI4tFXtizY5T+FvTRaJuGFoAFpiNRx 16/CrUbNfvTf52APRkK73vvI0qYJF9JygCcj+J9ESayg5aAcD7Z5KsPHaEEzWaGS MLy6q+bmDF9Vde8QaFiZWdKXFetno3BhFiHOGVaO/jG8hBZ/Ewo= =ib6m -----END PGP SIGNATURE----- --bGYF8yS29TFVuVT2TJ3HOnORGLL6QPhdQ--