From patchwork Wed Jan 8 14:57:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 308346 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 21BFD2C00B6 for ; Thu, 9 Jan 2014 01:57:41 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=LRcfloWt0dXkrzqN1 2nAOnVeradP0gMJGorCixj0WrrMJ/S0VWOl1GCQP+kj4ulDvQHDBk3AbGDlcQWeX xZKrpnfuk7LKO5WXPvyDYtQXAv+chqV6E8TERSHY7s0H9WKhgCzmEPJDZ7+WNxNY uzuR1/Ii3tisGTnYS7XnFIm9xo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=b9SnDjl6RZ2nnHQKPDK3Kml eT34=; b=f8McjBGOAdXUOCqnVWsIRnTuuQF0gaQ8HVh3Q0xg7dUPcY9qM6RcyMQ r85lOtLXAM3v2h3gYsvL4ywfOci+EL78F3bvELT4yI2ptLA25AKhWJ1WmfOa/9R1 Gm9WUw+QcTQMODyizkrwFq8HAb5A6EUAy7Y7BnEgqmDGXTKE/Et4= Received: (qmail 25236 invoked by alias); 8 Jan 2014 14:57:33 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 25220 invoked by uid 89); 8 Jan 2014 14:57:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 08 Jan 2014 14:57:30 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s08EvR2L028382 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Jan 2014 09:57:28 -0500 Received: from oldenburg.str.redhat.com (oldenburg.str.redhat.com [10.33.200.60]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s08EvPQP003823 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Wed, 8 Jan 2014 09:57:26 -0500 Message-ID: <52CD6755.5060003@redhat.com> Date: Wed, 08 Jan 2014 15:57:25 +0100 From: Florian Weimer User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Jakub Jelinek CC: GCC Patches , shenhan@google.com Subject: Re: Extend -fstack-protector-strong to cover calls with return slot References: <52C6B807.1070203@redhat.com> <20140103185715.GO892@tucnak.redhat.com> <52C72F05.2060901@redhat.com> <52CBF834.3040004@redhat.com> <20140107130748.GP892@tucnak.redhat.com> <52CC00A8.7070203@redhat.com> <20140107133723.GR892@tucnak.redhat.com> In-Reply-To: <20140107133723.GR892@tucnak.redhat.com> X-IsSubscribed: yes On 01/07/2014 02:37 PM, Jakub Jelinek wrote: > On Tue, Jan 07, 2014 at 02:27:04PM +0100, Florian Weimer wrote: >> gimplify_modify_expr_rhs, in the CALL_EXPR case: >> >> if (use_target) >> { >> CALL_EXPR_RETURN_SLOT_OPT (*from_p) = 1; >> mark_addressable (*to_p); >> } > > Yeah, that sets it in some cases too, not in other testcases. > > Just look at how the flag is used when actually expanding it: > > if (target && MEM_P (target) && CALL_EXPR_RETURN_SLOT_OPT (exp)) > structure_value_addr = XEXP (target, 0); > else > { > /* For variable-sized objects, we must be called with a target > specified. If we were to allocate space on the stack here, > we would have no way of knowing when to free it. */ > rtx d = assign_temp (rettype, 1, 1); > structure_value_addr = XEXP (d, 0); > target = 0; > } Okay, I'm beginning to understand. I tried to actually reach the second branch, and ended up with PR59711. :) foo12 in the new C testcase covers it in part without a variable-sized object. > so, if it is set, the address of the var on the LHS is passed to the > function as hidden argument, if it is not set, we pass address of > a stack temporary instead. Both the automatic var and the stack temporary > can overflow, if the callee does something wrong. What about the attached version? It still does not exactly match your original suggestion because gimple_call_lhs (stmt) can be NULL_TREE if the result is ignored and this case needs instrumentation, as you explained, so I use the function return type in the aggregate_value_p check. Testing is still under way, but looks good so far. I'm bootstrapping with BOOT_CFLAGS="-O2 -g -fstack-protector-strong" with Ada enabled, for additional coverage. gcc/ 2014-01-08 Florian Weimer * cfgexpand.c (stack_protect_decl_p): New function, extracted from expand_used_vars. (stack_protect_return_slot_p): New function. (expand_used_vars): Call stack_protect_decl_p and stack_protect_return_slot_p for -fstack-protector-strong. gcc/testsuite/ 2014-01-08 Florian Weimer * gcc.dg/fstack-protector-strong.c: Add coverage for return slots. * g++.dg/fstack-protector-strong.C: Likewise. * gcc.target/i386/ssp-strong-reg.c: New file. Index: gcc/cfgexpand.c =================================================================== --- gcc/cfgexpand.c (revision 206311) +++ gcc/cfgexpand.c (working copy) @@ -1599,6 +1599,52 @@ return 0; } +/* Check if the current function has local referenced variables that + have their addresses taken, contain an array, or are arrays. */ + +static bool +stack_protect_decl_p () +{ + unsigned i; + tree var; + + FOR_EACH_LOCAL_DECL (cfun, i, var) + if (!is_global_var (var)) + { + tree var_type = TREE_TYPE (var); + if (TREE_CODE (var) == VAR_DECL + && (TREE_CODE (var_type) == ARRAY_TYPE + || TREE_ADDRESSABLE (var) + || (RECORD_OR_UNION_TYPE_P (var_type) + && record_or_union_type_has_array_p (var_type)))) + return true; + } + return false; +} + +/* Check if the current function has calls that use a return slot. */ + +static bool +stack_protect_return_slot_p () +{ + basic_block bb; + + FOR_ALL_BB_FN (bb, cfun) + for (gimple_stmt_iterator gsi = gsi_start_bb (bb); + !gsi_end_p (gsi); gsi_next (&gsi)) + { + gimple stmt = gsi_stmt (gsi); + /* This assumes that calls to internal-only functions never + use a return slot. */ + if (is_gimple_call (stmt) + && !gimple_call_internal_p (stmt) + && aggregate_value_p (TREE_TYPE (gimple_call_fntype (stmt)), + gimple_call_fndecl (stmt))) + return true; + } + return false; +} + /* Expand all variables used in the function. */ static rtx @@ -1669,22 +1715,8 @@ pointer_map_destroy (ssa_name_decls); if (flag_stack_protect == SPCT_FLAG_STRONG) - FOR_EACH_LOCAL_DECL (cfun, i, var) - if (!is_global_var (var)) - { - tree var_type = TREE_TYPE (var); - /* Examine local referenced variables that have their addresses taken, - contain an array, or are arrays. */ - if (TREE_CODE (var) == VAR_DECL - && (TREE_CODE (var_type) == ARRAY_TYPE - || TREE_ADDRESSABLE (var) - || (RECORD_OR_UNION_TYPE_P (var_type) - && record_or_union_type_has_array_p (var_type)))) - { - gen_stack_protect_signal = true; - break; - } - } + gen_stack_protect_signal + = stack_protect_decl_p () || stack_protect_return_slot_p (); /* At this point all variables on the local_decls with TREE_USED set are not associated with any block scope. Lay them out. */ Index: gcc/testsuite/g++.dg/fstack-protector-strong.C =================================================================== --- gcc/testsuite/g++.dg/fstack-protector-strong.C (revision 206311) +++ gcc/testsuite/g++.dg/fstack-protector-strong.C (working copy) @@ -32,4 +32,52 @@ return global_func (a); } -/* { dg-final { scan-assembler-times "stack_chk_fail" 2 } } */ +/* Frame addressed exposed through return slot. */ + +struct B +{ + /* Discourage passing this struct in registers. */ + int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10; + int method (); + B return_slot(); +}; + +B global_func (); +void noop (); + +int foo3 () +{ + return global_func ().a1; +} + +int foo4 () +{ + try { + noop (); + return 0; + } catch (...) { + return global_func ().a1; + } +} + +int foo5 () +{ + try { + return global_func ().a1; + } catch (...) { + return 0; + } +} + +int foo6 () +{ + B b; + return b.method (); +} + +int foo7 (B *p) +{ + return p->return_slot ().a1; +} + +/* { dg-final { scan-assembler-times "stack_chk_fail" 7 } } */ Index: gcc/testsuite/gcc.dg/fstack-protector-strong.c =================================================================== --- gcc/testsuite/gcc.dg/fstack-protector-strong.c (revision 206311) +++ gcc/testsuite/gcc.dg/fstack-protector-strong.c (working copy) @@ -131,4 +131,22 @@ return bb.three; } -/* { dg-final { scan-assembler-times "stack_chk_fail" 10 } } */ +struct B +{ + /* Discourage passing this struct in registers. */ + int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10; +}; + +struct B global3 (void); + +int foo11 () +{ + return global3 ().a1; +} + +void foo12 () +{ + global3 (); +} + +/* { dg-final { scan-assembler-times "stack_chk_fail" 12 } } */ Index: gcc/testsuite/gcc.target/i386/ssp-strong-reg.c =================================================================== --- gcc/testsuite/gcc.target/i386/ssp-strong-reg.c (revision 0) +++ gcc/testsuite/gcc.target/i386/ssp-strong-reg.c (working copy) @@ -0,0 +1,19 @@ +/* Test that structs returned in registers do not lead to + instrumentation with -fstack-protector-strong. */ + +/* { dg-do compile { target { ! { ia32 } } } } */ +/* { dg-options "-O2 -fstack-protector-strong" } */ + +struct S { + int a; + int b; +}; + +struct S f (void); + +int g (void) +{ + return f ().a; +} + +/* { dg-final { scan-assembler-times "stack_chk_fail" 0 } } */