From patchwork Tue Jul 14 14:16:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 495106 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 2D336140761 for ; Wed, 15 Jul 2015 00:16:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=ftey2m3F; 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:from:to:cc:subject:date:message-id; q=dns; s= default; b=pJgbeFf2sw+oBZSYKXJolHXRdzhAdv6EqC196hwcnpKwE3bvVlSgD wtH09T73lSje+MavBFJYkaDGmQT/szfZwzCE/yRrT7JAZ102cJSjCXFSXl64w0W3 cBtGbnpCdWnTbyb7e78PiTTySfv/wAuk+0+lxctbaDCkX3+qPeVBBs= 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:from:to:cc:subject:date:message-id; s=default; bh=2SjsaDg965m35XtQI1/qtwrCu+Q=; b=ftey2m3F3d7W0jmifBd1y7ZqU69f ocCnyl1N9HMnvRQPhbI+SPoH+lql5eoLNB9pdIBnUpOXZWai8zZVToKYC1WJhULb 7XAxFigt5uDh2a1FQVdcYVBBDOVplNZSINd7wiogxefqalI1yusLeFHg1o7RBDGf 0j03l81aJSi6/vc= Received: (qmail 86578 invoked by alias); 14 Jul 2015 14:16:37 -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 86560 invoked by uid 89); 14 Jul 2015 14:16:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: "Siddhesh Poyarekar" To: libc-alpha@sourceware.org Cc: roland@hack.frob.com Subject: [PATCH] Remove Linuxism from tst-tls-atexit Date: Tue, 14 Jul 2015 19:46:23 +0530 Message-Id: <1436883383-6903-1-git-send-email-siddhesh@redhat.com> The tst-tls-atexit test case searches for its module in /proc/PID/maps to verify that it is unloaded, which is a Linux-specific test. This patch makes the test generic by trying to call foo (the symbol obtained from dlsym) and traps SIGSEGV momentarily to see if the crash occurred. Verified that the test continues to succeed on x86_64. There is a bug in the test case where it calls dlclose once again, which is actually incorrect but still manages to unload the DSO thanks to an existing bug in __tls_call_dtors. This will be fixed in a later patch which also fixes up the __cxa_thread_atexit_impl implementation. * stdlib/tst-tls-atexit.c: Include setjmp.h (foo): Move out from LOAD. (env): New variable. (segv_handler): New function. (load): Make static. (do_test): Install SIGSEGV handler and test for call to FOO. --- stdlib/tst-tls-atexit.c | 53 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/stdlib/tst-tls-atexit.c b/stdlib/tst-tls-atexit.c index 974264d..16b208d 100644 --- a/stdlib/tst-tls-atexit.c +++ b/stdlib/tst-tls-atexit.c @@ -27,10 +27,20 @@ #include #include #include +#include -void *handle; +static void *handle; +static void (*foo) (void); +static jmp_buf env; -void * +static void +segv_handler (int sig) +{ + /* All good. */ + longjmp (env, 1); +} + +static void * load (void *u) { handle = dlopen ("$ORIGIN/tst-tls-atexit-lib.so", RTLD_LAZY); @@ -40,7 +50,7 @@ load (void *u) return (void *) (uintptr_t) 1; } - void (*foo) (void) = (void (*) (void)) dlsym (handle, "do_foo"); + foo = (void (*) (void)) dlsym (handle, "do_foo"); if (foo == NULL) { @@ -82,29 +92,36 @@ do_test (void) /* Now this should unload the DSO. */ dlclose (handle); - /* Run through our maps and ensure that the DSO is unloaded. */ - FILE *f = fopen ("/proc/self/maps", "r"); - - if (f == NULL) + /* Handle SIGSEGV. We don't use the EXPECTED_SIGNAL macro because we want to + detect any other SIGSEGVs as failures. */ + struct sigaction sa, old_sa; + sa.sa_handler = segv_handler; + sigemptyset (&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction (SIGSEGV, &sa, &old_sa) < 0) { - perror ("Failed to open /proc/self/maps"); - fprintf (stderr, "Skipping verification of DSO unload\n"); - return 0; + printf ("Failed to set SIGSEGV handler: %m\n"); + return 1; } - char *line = NULL; - size_t s = 0; - while (getline (&line, &s, f) > 0) + if (setjmp (env) != 0) { - if (strstr (line, "tst-tls-atexit-lib.so")) - { - printf ("DSO not unloaded yet:\n%s", line); + /* Restore the default handler so that we may catch any SIGSEGVs + later. */ + if (sigaction (SIGSEGV, &old_sa, NULL) < 0) + { + printf ("Failed to restore SIGSEGV handler: %m\n"); return 1; } + + return 0; } - free (line); - return 0; + /* This should crash... */ + foo (); + + /* ... or else we fail. */ + return 1; } #define TEST_FUNCTION do_test ()