From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81415 invoked by alias); 20 Jun 2019 16:06:51 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 80548 invoked by uid 9014); 20 Jun 2019 16:06:51 -0000 Date: Thu, 20 Jun 2019 16:06:00 -0000 Message-ID: <20190620160651.80539.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zack Weinberg To: glibc-cvs@sourceware.org Subject: =?utf-8?q?=5Bglibc/zack/no-nested-includes=5D_Don=E2=80=99t_include_strin?= =?utf-8?q?g=2Eh_from_sys/un=2Eh=2E?= X-Act-Checkin: glibc X-Git-Author: Zack Weinberg X-Git-Refname: refs/heads/zack/no-nested-includes X-Git-Oldrev: b761b9106d2e7b70596c857cd0193b000c8c1389 X-Git-Newrev: fd0a2720650fa560321a7277500b316aec2df503 X-SW-Source: 2019-q2/txt/msg00503.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fd0a2720650fa560321a7277500b316aec2df503 commit fd0a2720650fa560321a7277500b316aec2df503 Author: Zack Weinberg Date: Wed May 22 12:03:57 2019 -0400 Don’t include string.h from sys/un.h. sys/un.h needs strlen in order to define SUN_LEN, but does not need any of the other things declared by string.h; the path of least resistance is to prototype strlen locally. Also, the construct being used to get the size of everything up to the sun_path member contains a formal dereference of a null pointer and therefore has undefined behavior. Replace with __SOCKADDR_COMMON_SIZE. Some old RPC code was relying on sys/un.h to provide all of string.h. * sys/un.h [__USE_MISC]: Don’t include string.h. Include bits/types/size_t.h. Prototype strlen locally. Use __SOCKADDR_COMMON_SIZE for size of leading members of struct sockaddr_un. * nis/nis_domain_of.c, nis/yp_xdr.c, sunrpc/svc.c: Include string.h. * scripts/check-obsolete-constructs.py (HEADER_ALLOWED_INCLUDES): Update. Diff: --- nis/nis_domain_of.c | 1 + nis/yp_xdr.c | 1 + scripts/check-obsolete-constructs.py | 1 - socket/sys/un.h | 8 +++++--- sunrpc/svc.c | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nis/nis_domain_of.c b/nis/nis_domain_of.c index 44c5b04..da26df3 100644 --- a/nis/nis_domain_of.c +++ b/nis/nis_domain_of.c @@ -17,6 +17,7 @@ . */ #include +#include #include nis_name diff --git a/nis/yp_xdr.c b/nis/yp_xdr.c index 3b57673..4c9f1d2 100644 --- a/nis/yp_xdr.c +++ b/nis/yp_xdr.c @@ -31,6 +31,7 @@ #include #include +#include #include /* The NIS v2 protocol suggests 1024 bytes as a maximum length of all fields. diff --git a/scripts/check-obsolete-constructs.py b/scripts/check-obsolete-constructs.py index bca0f12..d230fcf 100755 --- a/scripts/check-obsolete-constructs.py +++ b/scripts/check-obsolete-constructs.py @@ -539,7 +539,6 @@ HEADER_ALLOWED_INCLUDES = { "sys/types.h": [ "endian.h" ], "sys/uio.h": [ "sys/types.h" ], - "sys/un.h": [ "string.h" ], # POSIX networking headers # allowed: netdb.h -> netinet/in.h diff --git a/socket/sys/un.h b/socket/sys/un.h index 8c7433a..540560e 100644 --- a/socket/sys/un.h +++ b/socket/sys/un.h @@ -34,11 +34,13 @@ struct sockaddr_un #ifdef __USE_MISC -# include /* For prototype of `strlen'. */ +#include + +extern size_t strlen (const char *__s) + __THROW __attribute_pure__ __nonnull ((1)); /* Evaluate to actual length of the `sockaddr_un' structure. */ -# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \ - + strlen ((ptr)->sun_path)) +# define SUN_LEN(ptr) (__SOCKADDR_COMMON_SIZE + strlen ((ptr)->sun_path)) #endif __END_DECLS diff --git a/sunrpc/svc.c b/sunrpc/svc.c index 95ecfbb..8042019 100644 --- a/sunrpc/svc.c +++ b/sunrpc/svc.c @@ -53,6 +53,7 @@ */ #include +#include #include #include #include