From patchwork Tue Mar 14 14:35:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 738739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vjHNR02WRz9ryv for ; Wed, 15 Mar 2017 01:36:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="HhkK0MZO"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= QUps0phVGXMsZQTuBFhLCtxBLBWHXCr0wVksnmIcRhhNszIujEOpxmatQ6V1nqVi as7HPbTo5/ay/D9YByPymz+lMG80oySOxFiaXXKeblTVOoUN1twFd0F3wo/46WG0 EEXBU2QeTj0WhcYLf6NQRnzq9HrDlkYWtIorAeKWqAQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=jcKfe2 CHwGxrReHpHpp48LID9PI=; b=HhkK0MZOwyXaJKvqtCsxl07H+bzVLwnSudoVpv 0U7y/saDb9xOM1VYPKD4o+/39KmQxwd+UniNjawXFCYjY5j2ViWCht7Sx/ZXnO3t GZH88DI+PohwiV+v3b0gjK8KevVQumyhchBFBN12tjBLzXrzcRAcSnYaDVB2t5aO AIKQY= Received: (qmail 105077 invoked by alias); 14 Mar 2017 14:35:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 104659 invoked by uid 89); 14 Mar 2017 14:35:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=3010, 11237, 8827, 239 X-HELO: mx1.redhat.com Date: Tue, 14 Mar 2017 15:35:51 +0100 To: libc-alpha@sourceware.org Subject: [PATCH] support: Add error checking to close system calls [BZ #21244] User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170314143551.7E48D41906F80@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-03-14 Florian Weimer [BZ #21244] * support/xclose.c: New file. * support/Makefile (libsupport-routines): Add xclose. * support/xunistd.h (xclose): Declare. * support/resolv_test.c (server_thread_tcp_client) (server_thread_tcp, make_server_sockets, resolv_test_start) (resolv_test_end): Call xclose instead of close. * support/support_enter_network_namespace.c (support_enter_network_namespace): Likewise. * support/support_run_diff.c (write_to_temp_file): Likewise. diff --git a/support/Makefile b/support/Makefile index db7bb13..1f33fa0 100644 --- a/support/Makefile +++ b/support/Makefile @@ -53,6 +53,7 @@ libsupport-routines = \ xasprintf \ xbind \ xcalloc \ + xclose \ xconnect \ xfclose \ xfopen \ diff --git a/support/resolv_test.c b/support/resolv_test.c index 2d0ea3c..9fc5d5b 100644 --- a/support/resolv_test.c +++ b/support/resolv_test.c @@ -32,6 +32,7 @@ #include #include #include +#include #include /* Response builder. */ @@ -860,7 +861,7 @@ server_thread_tcp_client (void *arg) break; } - close (closure->client_socket); + xclose (closure->client_socket); free (closure); return NULL; } @@ -881,7 +882,7 @@ server_thread_tcp (struct resolv_test *obj, int server_index) if (obj->termination_requested) { xpthread_mutex_unlock (&obj->lock); - close (client_socket); + xclose (client_socket); break; } xpthread_mutex_unlock (&obj->lock); @@ -941,8 +942,8 @@ make_server_sockets (struct resolv_test_server *server) next local UDP address randomly. */ if (errno == EADDRINUSE) { - close (server->socket_udp); - close (server->socket_tcp); + xclose (server->socket_udp); + xclose (server->socket_tcp); continue; } FAIL_EXIT1 ("TCP bind: %m"); @@ -1025,7 +1026,7 @@ resolv_test_start (struct resolv_redirect_config config) struct resolv_test_server *server = obj->servers + server_index; if (config.servers[server_index].disable_udp) { - close (server->socket_udp); + xclose (server->socket_udp); server->socket_udp = -1; } else if (!config.single_thread_udp) @@ -1033,7 +1034,7 @@ resolv_test_start (struct resolv_redirect_config config) server_thread_udp); if (config.servers[server_index].disable_tcp) { - close (server->socket_tcp); + xclose (server->socket_tcp); server->socket_tcp = -1; } else @@ -1114,7 +1115,7 @@ resolv_test_end (struct resolv_test *obj) xsendto (sock, "", 1, 0, (struct sockaddr *) &obj->servers[server_index].address, sizeof (obj->servers[server_index].address)); - close (sock); + xclose (sock); } if (!obj->config.servers[server_index].disable_tcp) { @@ -1122,7 +1123,7 @@ resolv_test_end (struct resolv_test *obj) xconnect (sock, (struct sockaddr *) &obj->servers[server_index].address, sizeof (obj->servers[server_index].address)); - close (sock); + xclose (sock); } } @@ -1137,12 +1138,12 @@ resolv_test_end (struct resolv_test *obj) { if (!obj->config.single_thread_udp) xpthread_join (obj->servers[server_index].thread_udp); - close (obj->servers[server_index].socket_udp); + xclose (obj->servers[server_index].socket_udp); } if (!obj->config.servers[server_index].disable_tcp) { xpthread_join (obj->servers[server_index].thread_tcp); - close (obj->servers[server_index].socket_tcp); + xclose (obj->servers[server_index].socket_tcp); } } diff --git a/support/support_enter_network_namespace.c b/support/support_enter_network_namespace.c index d2e78fe..28b0ee2 100644 --- a/support/support_enter_network_namespace.c +++ b/support/support_enter_network_namespace.c @@ -23,9 +23,10 @@ #include #include #include +#include +#include #include #include -#include static bool in_uts_namespace; @@ -58,7 +59,7 @@ support_enter_network_namespace (void) req.ifr_flags |= IFF_UP | IFF_RUNNING; TEST_VERIFY_EXIT (ioctl (fd, SIOCSIFFLAGS, &req) == 0); } - close (fd); + xclose (fd); return !already_up; } diff --git a/support/support_run_diff.c b/support/support_run_diff.c index 3085037..f5155de 100644 --- a/support/support_run_diff.c +++ b/support/support_run_diff.c @@ -24,8 +24,8 @@ #include #include #include +#include #include -#include static char * write_to_temp_file (const char *prefix, const char *str) @@ -36,7 +36,7 @@ write_to_temp_file (const char *prefix, const char *str) TEST_VERIFY_EXIT (fd >= 0); free (template); xwrite (fd, str, strlen (str)); - TEST_VERIFY_EXIT (close (fd) == 0); + xclose (fd); return name; } diff --git a/support/xclose.c b/support/xclose.c new file mode 100644 index 0000000..c931e08 --- /dev/null +++ b/support/xclose.c @@ -0,0 +1,28 @@ +/* close with error checking. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include + +void +xclose (int fd) +{ + if (close (fd) < 0 && errno != EINTR) + FAIL_EXIT1 ("close of descriptor %d failed: %m", fd); +} diff --git a/support/xunistd.h b/support/xunistd.h index a83b1f4..3c34a85 100644 --- a/support/xunistd.h +++ b/support/xunistd.h @@ -30,6 +30,10 @@ __BEGIN_DECLS pid_t xfork (void); pid_t xwaitpid (pid_t, int *status, int flags); +/* Close the file descriptor. Ignore EINTR errors, but terminate the + process on other errors. */ +void xclose (int); + /* Write the buffer. Retry on short writes. */ void xwrite (int, const void *, size_t);