From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12940 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 20:21:38 +0200 Message-ID: <1e699a6f-22b8-83fc-9ef4-04b2ad8542f2@universe-factory.net> References: <4e0877a604bad684be020f68e96a05156131fd44.1529853403.git.mschiffer@universe-factory.net> <20180624153019.GT1392@brightrain.aerifal.cx> <21de6b7c-21d4-ad8c-8680-e26e968e4316@universe-factory.net> 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="DtkrioAHEhMjez3seVZyFGbxiUMFgOVFY" X-Trace: blaine.gmane.org 1530037182 32627 195.159.176.226 (26 Jun 2018 18:19:42 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 26 Jun 2018 18:19:42 +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-12956-gllmg-musl=m.gmane.org@lists.openwall.com Tue Jun 26 20:19:37 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 1fXsYz-0008OE-L3 for gllmg-musl@m.gmane.org; Tue, 26 Jun 2018 20:19:37 +0200 Original-Received: (qmail 28049 invoked by uid 550); 26 Jun 2018 18:21:44 -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 28030 invoked from network); 26 Jun 2018 18:21:43 -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: <21de6b7c-21d4-ad8c-8680-e26e968e4316@universe-factory.net> Xref: news.gmane.org gmane.linux.lib.musl.general:12940 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --DtkrioAHEhMjez3seVZyFGbxiUMFgOVFY Content-Type: multipart/mixed; boundary="by6RWbBA15h2dTbVfyJH9QRdVjr2GADFy"; protected-headers="v1" From: Matthias Schiffer To: musl@lists.openwall.com Message-ID: <1e699a6f-22b8-83fc-9ef4-04b2ad8542f2@universe-factory.net> 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> In-Reply-To: <21de6b7c-21d4-ad8c-8680-e26e968e4316@universe-factory.net> --by6RWbBA15h2dTbVfyJH9QRdVjr2GADFy Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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_PEE= RSEC >>> 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 the >> 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 >> >=20 >=20 > That would actually make sense. I did not research what SO_PEERSEC even= 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. >=20 > Matthias >=20 Should I send an updated patch, or are you going to fix it up yourself? Matthias --by6RWbBA15h2dTbVfyJH9QRdVjr2GADFy-- --DtkrioAHEhMjez3seVZyFGbxiUMFgOVFY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEZmTnvaa2aYgexS51Fu8/ZMsgHZwFAlsyhDIACgkQFu8/ZMsg HZxcnA/+Kd6FRlhrzr9mFG5DVMz3bAwFcaHBsQFCWS+3Xt42+gQDc6e9D8qnbVHZ aO0leXPXBaPVahjhyBM5liN0WSE2C5rxArb9AwmsptirR8XPsijMnM+2VcYfLtxi 18J1QG1haxXJiylHgPWW8bO4YjKDfORRHqOzOzyy7jgHwaLpdof/CxL2as9jGiw+ BvIgah2Aw4GD4crN6QpVsO9F97x1/lJJMxFRgPJ5oUkZ4fw2yMS8Go5q/ogAdo9W Egxar1UwnTp6V0+Ecu3rZnnHN0puxCUzQy1gcQePQFkeRL15K/YK6/ND/jyMm6uS TYmQpcRmXLnliSIn5eSbOt6QWTcNCRkWe4fLAi4iA6OO8XzPql5XgjiWMywxFZr9 eeWmhFh+edJ2xzyQXqKaP0cw5LBzIsl+tLb2j6HM0Rsa90RVbVxyPuk8oSYVdVOx NEIyuG15Y/0/O9cee4CYn/1xAv6l1pySMOMlNsrwdy1G/Ef1R68RkmVtI0Sx+Ohc oyIOMs/eVkS0LthJiPGAcAYNMwGrzcF/XtLLDQcbOkvfCQbuVqP4g9p0SD2fqHMs 1skXcb0c+AWv1qGS7wfYumgkLFtRKBvkrJcqTe5hzk3hGvYfnAyiNt8EkftHArit jGDm2JHbP0XG/SJRlEE2C6i7mdluH+xH79W7J4ffFQPyc04bY0A= =3uCe -----END PGP SIGNATURE----- --DtkrioAHEhMjez3seVZyFGbxiUMFgOVFY--