From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12941 Path: news.gmane.org!.POSTED!not-for-mail From: Rich Felker Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH] sys/socket.h: fix SO_PEERSEC value on MIPS Date: Tue, 26 Jun 2018 16:05:25 -0400 Message-ID: <20180626200525.GV1392@brightrain.aerifal.cx> 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> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1530043415 4149 195.159.176.226 (26 Jun 2018 20:03:35 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 26 Jun 2018 20:03:35 +0000 (UTC) User-Agent: Mutt/1.5.21 (2010-09-15) To: musl@lists.openwall.com Original-X-From: musl-return-12957-gllmg-musl=m.gmane.org@lists.openwall.com Tue Jun 26 22:03:31 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 1fXuBW-0000zk-8B for gllmg-musl@m.gmane.org; Tue, 26 Jun 2018 22:03:30 +0200 Original-Received: (qmail 21681 invoked by uid 550); 26 Jun 2018 20:05:38 -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 21661 invoked from network); 26 Jun 2018 20:05:37 -0000 Content-Disposition: inline In-Reply-To: <1e699a6f-22b8-83fc-9ef4-04b2ad8542f2@universe-factory.net> Original-Sender: Rich Felker Xref: news.gmane.org gmane.linux.lib.musl.general:12941 Archived-At: 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_PEERSEC > >>> 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 > >>> > >>> +#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 > >>> > >>> +#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 > >>> > >>> +#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 > >>> > >>> +#ifndef SO_PEERSEC > >>> #define SO_PEERSEC 31 > >>> +#endif > >>> + > >>> #define SO_PASSSEC 34 > >>> #define SO_TIMESTAMPNS 35 > >>> #define SCM_TIMESTAMPNS SO_TIMESTAMPNS > >>> -- > >>> 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 > >> > > > > > > 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. > > Should I send an updated patch, or are you going to fix it up yourself? 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. 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). Anyway I won't delay the immediate bugfix with what-ifs about future direction. Rich