From patchwork Sat Aug 15 18:01:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Pluzhnikov X-Patchwork-Id: 507640 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 091731401AB for ; Sun, 16 Aug 2015 04:01:48 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=Dz4i5oFN; 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:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; q=dns; s=default; b= lNmWTIVyCPfkT7wFIG7aTRZv2TySF8udqfjhGaOI8tWViiqCOigmhT6BPgXrYV6b OPdc6JMZMgVnCcK/ouocTxAvkO1ufD3i05S9eh+QlH8CagqrH3HdtoINiKLPK5E2 W6XtmnR87fHsFVhd+Df9wpNWWVD8la+aLApKRiToONc= 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:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; s=default; bh=aFStx 3S0NbBQjur7m6x5qV0XRH8=; b=Dz4i5oFNMh3C4f2IbFpL3YyXJDar9oJ5E+1QS gSO6et+27/gQshkrXQ7EeZWP7itO6lMLupxUoaU4ctzu2BpuWa9MbBlnt2/buWA+ VA7N8DiT6SBVS2s2u3Gm62B57Achwf8I33sppSFXt3wmAoWL9tcBHrzSCFg7D4qg FJ+XFE= Received: (qmail 98149 invoked by alias); 15 Aug 2015 18:01:41 -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 98130 invoked by uid 89); 15 Aug 2015 18:01:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-io0-f182.google.com MIME-Version: 1.0 X-Received: by 10.107.134.94 with SMTP id i91mr50580625iod.162.1439661696028; Sat, 15 Aug 2015 11:01:36 -0700 (PDT) In-Reply-To: <55C8F556.30001@googlemail.com> References: <55C8F556.30001@googlemail.com> Date: Sat, 15 Aug 2015 11:01:35 -0700 Message-ID: Subject: Re: Fix BZ #18084 (backtrace(..., 0) crash on x86) From: Paul Pluzhnikov To: Tolga Dalman Cc: GLIBC Devel On Mon, Aug 10, 2015 at 12:02 PM, Tolga Dalman wrote: > On 08/10/2015 02:04 AM, Paul Pluzhnikov wrote: >> This patch fixes BZ #18084 -- crash in backtrace(..., 0) on x86. >> Tested on Linux/x86, no new failures. > > That looks correct and should be applied to the other arches as well > (I looked at x86_64 and arm). Thanks. Revised patch attached. 2015-08-15 Paul Pluzhnikov * debug/tst-backtrace2.c (do_test): Add test for BZ #18084. * sysdeps/arm/backtrace.c (__backtrace): Handle size == 0. * sysdeps/i386/backtrace.c (__backtrace): Likewise. * sysdeps/m68k/backtrace.c (__backtrace): Likewise. * sysdeps/microblaze/backtrace.c (__backtrace): Likewise. * sysdeps/s390/s390-32/backtrace.c (__backtrace): Likewise. * sysdeps/s390/s390-64/backtrace.c (__backtrace): Likewise. * sysdeps/sparc/backtrace.c (__backtrace): Likewise. * sysdeps/x86_64/backtrace.c (__backtrace): Likewise. diff --git a/debug/tst-backtrace2.c b/debug/tst-backtrace2.c index 846ca35..396d743 100644 --- a/debug/tst-backtrace2.c +++ b/debug/tst-backtrace2.c @@ -94,6 +94,12 @@ fn3 (void) NO_INLINE static int do_test (void) { + /* Test BZ #18084. */ + void *buffer[1]; + + if (backtrace (buffer, 0) != 0) + FAIL (); + fn3 (); return ret; } diff --git a/sysdeps/arm/backtrace.c b/sysdeps/arm/backtrace.c index 7ab487c..5a30c20 100644 --- a/sysdeps/arm/backtrace.c +++ b/sysdeps/arm/backtrace.c @@ -92,6 +92,10 @@ __backtrace (array, size) int size; { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + + if (size <= 0) + return 0; + #ifdef SHARED __libc_once_define (static, once); @@ -100,8 +104,7 @@ __backtrace (array, size) return 0; #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + unwind_backtrace (backtrace_helper, &arg); if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL) --arg.cnt; diff --git a/sysdeps/i386/backtrace.c b/sysdeps/i386/backtrace.c index 550234f..f10ed56 100644 --- a/sysdeps/i386/backtrace.c +++ b/sysdeps/i386/backtrace.c @@ -114,6 +114,10 @@ __backtrace (array, size) int size; { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + + if (size <= 0) + return 0; + #ifdef SHARED __libc_once_define (static, once); @@ -122,8 +126,7 @@ __backtrace (array, size) return 0; #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + unwind_backtrace (backtrace_helper, &arg); if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL) --arg.cnt; diff --git a/sysdeps/m68k/backtrace.c b/sysdeps/m68k/backtrace.c index 3114251..ca7d259 100644 --- a/sysdeps/m68k/backtrace.c +++ b/sysdeps/m68k/backtrace.c @@ -111,6 +111,10 @@ int __backtrace (void **array, int size) { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + + if (size <= 0) + return 0; + #ifdef SHARED __libc_once_define (static, once); @@ -119,8 +123,7 @@ __backtrace (void **array, int size) return 0; #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + unwind_backtrace (backtrace_helper, &arg); if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL) --arg.cnt; diff --git a/sysdeps/microblaze/backtrace.c b/sysdeps/microblaze/backtrace.c index 24e827a..c043ba7 100644 --- a/sysdeps/microblaze/backtrace.c +++ b/sysdeps/microblaze/backtrace.c @@ -114,6 +114,9 @@ __backtrace (void **array, int size) int count; int rc = 0; + if (size <= 0) + return 0; + __asm__ __volatile__ ("mfs %0, rpc" : "=r"(pc)); diff --git a/sysdeps/s390/s390-32/backtrace.c b/sysdeps/s390/s390-32/backtrace.c index 73db652..4e5e1fe 100644 --- a/sysdeps/s390/s390-32/backtrace.c +++ b/sysdeps/s390/s390-32/backtrace.c @@ -126,6 +126,10 @@ int __backtrace (void **array, int size) { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + + if (size <= 0) + return 0; + #ifdef SHARED __libc_once_define (static, once); @@ -135,8 +139,7 @@ __backtrace (void **array, int size) return __backchain_backtrace (array, size); #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + unwind_backtrace (backtrace_helper, &arg); return arg.cnt != -1 ? arg.cnt : 0; } diff --git a/sysdeps/s390/s390-64/backtrace.c b/sysdeps/s390/s390-64/backtrace.c index 08e563e..184a737 100644 --- a/sysdeps/s390/s390-64/backtrace.c +++ b/sysdeps/s390/s390-64/backtrace.c @@ -125,6 +125,10 @@ int __backtrace (void **array, int size) { struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + + if (size <= 0) + return 0; + #ifdef SHARED __libc_once_define (static, once); @@ -134,8 +138,7 @@ __backtrace (void **array, int size) return __backchain_backtrace (array, size); #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + unwind_backtrace (backtrace_helper, &arg); return arg.cnt != -1 ? arg.cnt : 0; } diff --git a/sysdeps/sparc/backtrace.c b/sysdeps/sparc/backtrace.c index 754f45b..cb01fd6 100644 --- a/sysdeps/sparc/backtrace.c +++ b/sysdeps/sparc/backtrace.c @@ -108,7 +108,7 @@ __backtrace (void **array, int size) bool use_unwinder; int count; - if (!size) + if (size <= 0) return 0; use_unwinder = true; diff --git a/sysdeps/x86_64/backtrace.c b/sysdeps/x86_64/backtrace.c index 2a3848d..21448c8 100644 --- a/sysdeps/x86_64/backtrace.c +++ b/sysdeps/x86_64/backtrace.c @@ -97,6 +97,10 @@ __backtrace (array, size) int size; { struct trace_arg arg = { .array = array, .cfa = 0, .size = size, .cnt = -1 }; + + if (size <= 0) + return 0; + #ifdef SHARED __libc_once_define (static, once); @@ -105,8 +109,7 @@ __backtrace (array, size) return 0; #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + unwind_backtrace (backtrace_helper, &arg); /* _Unwind_Backtrace seems to put NULL address above _start. Fix it up here. */