From patchwork Thu Dec 3 12:41:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 552247 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8EFF41402DE for ; Thu, 3 Dec 2015 23:45:30 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4TGL-0005ig-9H; Thu, 03 Dec 2015 12:45:29 +0000 Received: from smtprelay2.synopsys.com ([198.182.60.111] helo=smtprelay.synopsys.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4TGI-0005Fi-0E for linux-snps-arc@lists.infradead.org; Thu, 03 Dec 2015 12:45:27 +0000 Received: from dc8secmta2.synopsys.com (dc8secmta2.synopsys.com [10.13.218.202]) by smtprelay.synopsys.com (Postfix) with ESMTP id 8FC7310C122B; Thu, 3 Dec 2015 04:45:05 -0800 (PST) Received: from dc8secmta2.internal.synopsys.com (dc8secmta2.internal.synopsys.com [127.0.0.1]) by dc8secmta2.internal.synopsys.com (Service) with ESMTP id 82163A4116; Thu, 3 Dec 2015 04:45:05 -0800 (PST) Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by dc8secmta2.internal.synopsys.com (Service) with ESMTP id 3F9EBA4102; Thu, 3 Dec 2015 04:45:05 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 2831B307; Thu, 3 Dec 2015 04:45:05 -0800 (PST) Received: from US01WXQAHTC1.internal.synopsys.com (us01wxqahtc1.internal.synopsys.com [10.12.238.230]) by mailhost.synopsys.com (Postfix) with ESMTP id 1ACBA303; Thu, 3 Dec 2015 04:45:05 -0800 (PST) Received: from IN01WEHTCB.internal.synopsys.com (10.144.199.106) by US01WXQAHTC1.internal.synopsys.com (10.12.238.230) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 3 Dec 2015 04:42:49 -0800 Received: from IN01WEHTCA.internal.synopsys.com (10.144.199.103) by IN01WEHTCB.internal.synopsys.com (10.144.199.105) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 3 Dec 2015 18:12:46 +0530 Received: from vineetg-E7440.internal.synopsys.com (10.12.197.182) by IN01WEHTCA.internal.synopsys.com (10.144.199.243) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 3 Dec 2015 18:12:45 +0530 From: Vineet Gupta To: Subject: [PATCH 15/17] ARC: dw2 unwind: Single exit point for instrumentation Date: Thu, 3 Dec 2015 18:11:13 +0530 Message-ID: <1449146475-15335-16-git-send-email-vgupta@synopsys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449146475-15335-1-git-send-email-vgupta@synopsys.com> References: <1449146475-15335-1-git-send-email-vgupta@synopsys.com> MIME-Version: 1.0 X-Originating-IP: [10.12.197.182] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151203_044526_156207_3490FF06 X-CRM114-Status: UNSURE ( 9.65 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [198.182.60.111 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [198.182.60.111 listed in wl.mailspike.net] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vineet Gupta , Alexey.Brodkin@synopsys.com, linux-kernel@vger.kernel.org, JBeulich@suse.com Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Vineet Gupta --- arch/arc/kernel/unwind.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 4f739716f908..e02d974ea789 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -904,6 +904,7 @@ int arc_unwind(struct unwind_frame_info *frame) unsigned long *fptr; unsigned long addr; struct eh_frame_header *hdr; + int ret = -EINVAL; unw_debug("\nUNWIND FRAME: -------------------------------------\n"); unw_debug("PC\t\t: 0x%lx %pS\nr31 [BLINK]\t: 0x%lx %pS\nr28 [SP]\t: 0x%lx\nr27 [FP]\t: 0x%lx\n", @@ -912,7 +913,7 @@ int arc_unwind(struct unwind_frame_info *frame) UNW_SP(frame), UNW_FP(frame)); if (UNW_PC(frame) == 0) - return -EINVAL; + goto bad_unw; #ifdef UNWIND_DEBUG0 { @@ -926,11 +927,11 @@ int arc_unwind(struct unwind_frame_info *frame) table = find_table(pc); if (table == NULL) - return -EINVAL; + goto bad_unw; hdr = table->header; if (hdr == NULL) - return -EINVAL; + goto bad_unw; s = i = 0; e = hdr->fde_count - 1; @@ -948,7 +949,7 @@ int arc_unwind(struct unwind_frame_info *frame) if (pc >= startLoc) fde = (u32 *)hdr->table[i].fde; else - return -EINVAL; + goto bad_unw; memset(&state, 0, sizeof(state)); ptr = (const u8 *)(fde + 2); @@ -956,7 +957,7 @@ int arc_unwind(struct unwind_frame_info *frame) ptrType = table->cie.fde_pointer_type; if (read_pointer(&ptr, end, ptrType) != startLoc) - return -EINVAL; + goto bad_unw; if (!(ptrType & DW_EH_PE_indirect)) ptrType &= DW_EH_PE_FORM | DW_EH_PE_signed; @@ -967,14 +968,15 @@ int arc_unwind(struct unwind_frame_info *frame) if (pc >= endLoc) { unw_debug("Unwindo info missing for PC %lx: {%lx,%lx}\n", pc, startLoc, endLoc); - return -EINVAL; + ret = -ENOENT; + goto bad_unw; } if (table->cie.aug) { uleb128_t augSize = get_uleb128(&ptr, end); if ((ptr += augSize) > end) - return -EINVAL; + goto bad_unw; } state.org = state.loc = startLoc; @@ -995,8 +997,10 @@ int arc_unwind(struct unwind_frame_info *frame) || state.loc > endLoc /* || state.regs[retAddrReg].where == Nowhere */ || state.cfa.reg >= ARRAY_SIZE(reg_info) - || state.cfa.offs % sizeof(unsigned long)) - return -EIO; + || state.cfa.offs % sizeof(unsigned long)) { + ret = -EIO; + goto bad_unw; + } cfa = FRAME_REG(state.cfa.reg, unsigned long) + state.cfa.offs; startLoc = min_t(unsigned long, UNW_SP(frame), cfa); @@ -1022,7 +1026,7 @@ int arc_unwind(struct unwind_frame_info *frame) for (i = 0; state.has_cfa_register && i < ARRAY_SIZE(state.regs); ++i) { if (state.regs[i].where == Register) { if (state.regs[i].value >= ARRAY_SIZE(reg_info)) - return -EIO; + goto bad_unw; state.regs[i].value = FRAME_REG(state.regs[i].value, unsigned long); } @@ -1054,7 +1058,7 @@ int arc_unwind(struct unwind_frame_info *frame) || addr < startLoc || addr + sizeof(unsigned long) < addr || addr + sizeof(unsigned long) > endLoc) - return -EIO; + goto bad_unw; FRAME_REG(i, unsigned long) = *(unsigned long *)addr; break; @@ -1062,7 +1066,10 @@ int arc_unwind(struct unwind_frame_info *frame) unw_debug("r%d: 0x%lx\n", i, *fptr); } - return 0; + ret = 0; +bad_unw: + + return ret; #undef FRAME_REG } EXPORT_SYMBOL(arc_unwind);