From patchwork Mon Aug 10 00:04:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Pluzhnikov X-Patchwork-Id: 505502 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 0F94D1401E7 for ; Mon, 10 Aug 2015 10:04:14 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=eoMl7Il/; 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:date:message-id:subject:from:to :cc:content-type; q=dns; s=default; b=Rp+ZKQ9iG5CLPqknF7IJHIHtTD YU4oZTctTFtggsQfGUOWuqDuZ4C0oViiOTk7Wyfu0HiOTOUmqF0dFF4q/saCOsj0 cu4nJVnJYw/6G1+sdzRsi+u6lV91zIO0t+xe6WjJLPlhqyBljYmLo+EpJZMCnZQ5 V4MtuWoCZRagDEdXM= 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:date:message-id:subject:from:to :cc:content-type; s=default; bh=BVa4ol9pRdN81oD5e9LSR9gSeo4=; b= eoMl7Il/c1uWgFUUS4pVmW0J5MIeDKQtSWo63eeoYZCzQulqovsFvflUjqcHBYlk NMM3No6D+v+FnCXbNCUtT5yB3lqq4T80a22y5a9OviAGJYPEdB6mxO7Aax1kwPQt 7DoiL3J61g8kRF9F3mgM0K51kG3cdtTxpGub96acjA0= Received: (qmail 101805 invoked by alias); 10 Aug 2015 00:04:08 -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 101795 invoked by uid 89); 10 Aug 2015 00:04:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 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-f173.google.com MIME-Version: 1.0 X-Received: by 10.107.9.11 with SMTP id j11mr6737863ioi.191.1439165045288; Sun, 09 Aug 2015 17:04:05 -0700 (PDT) Date: Sun, 9 Aug 2015 17:04:05 -0700 Message-ID: Subject: Fix BZ #18084 (backtrace(..., 0) crash on x86) From: Paul Pluzhnikov To: GLIBC Devel Cc: Paul Pluzhnikov Greetings, This patch fixes BZ #18084 -- crash in backtrace(..., 0) on x86. Tested on Linux/x86, no new failures. Thanks, 2015-08-09 Paul Pluzhnikov * sysdeps/i386/backtrace.c (__backtrace): Handle size==0. * debug/tst-backtrace2.c (do_test): Add test for BZ #18084. 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/i386/backtrace.c b/sysdeps/i386/backtrace.c index 550234f..a0eff81 100644 --- a/sysdeps/i386/backtrace.c +++ b/sysdeps/i386/backtrace.c @@ -122,8 +122,10 @@ __backtrace (array, size) return 0; #endif - if (size >= 1) - unwind_backtrace (backtrace_helper, &arg); + if (size <= 0) + return 0; + + unwind_backtrace (backtrace_helper, &arg); if (arg.cnt > 1 && arg.array[arg.cnt - 1] == NULL) --arg.cnt;