From patchwork Thu Dec 3 12:41:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 552238 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 083731402DE for ; Thu, 3 Dec 2015 23:42:43 +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 1a4TDd-0003uL-FI; Thu, 03 Dec 2015 12:42:41 +0000 Received: from smtprelay4.synopsys.com ([198.182.47.9] helo=smtprelay.synopsys.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4TDc-0003pj-A6 for linux-snps-arc@lists.infradead.org; Thu, 03 Dec 2015 12:42:40 +0000 Received: from us02secmta2.synopsys.com (us02secmta2.synopsys.com [10.12.235.98]) by smtprelay.synopsys.com (Postfix) with ESMTP id 08EF324E1583; Thu, 3 Dec 2015 04:42:21 -0800 (PST) Received: from us02secmta2.internal.synopsys.com (us02secmta2.internal.synopsys.com [127.0.0.1]) by us02secmta2.internal.synopsys.com (Service) with ESMTP id F1B9D55F1D; Thu, 3 Dec 2015 04:42:20 -0800 (PST) Received: from mailhost.synopsys.com (unknown [10.13.184.66]) by us02secmta2.internal.synopsys.com (Service) with ESMTP id CD18755F18; Thu, 3 Dec 2015 04:42:20 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id BCADA2F0; Thu, 3 Dec 2015 04:42:20 -0800 (PST) Received: from us01wehtc1.internal.synopsys.com (us01wehtc1.internal.synopsys.com [10.12.239.235]) by mailhost.synopsys.com (Postfix) with ESMTP id B06962EF; Thu, 3 Dec 2015 04:42:20 -0800 (PST) Received: from IN01WEHTCB.internal.synopsys.com (10.144.199.106) by us01wehtc1.internal.synopsys.com (10.12.239.231) with Microsoft SMTP Server (TLS) id 14.3.195.1; Thu, 3 Dec 2015 04:42:14 -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:12 +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:11 +0530 From: Vineet Gupta To: Subject: [PATCH 08/17] ARC: dw2 unwind: Don't verify FDE lookup table metadata Date: Thu, 3 Dec 2015 18:11:06 +0530 Message-ID: <1449146475-15335-9-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_044240_363233_F6381812 X-CRM114-Status: UNSURE ( 9.88 ) 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.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [198.182.47.9 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [198.182.47.9 listed in list.dnswl.org] -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 FDE Lookup table (eh_frame_header or it's equivalent constructed by hand) is already setup correctly in setup_unwind_table(). There's no point to re-parse it's header for every unwind call Signed-off-by: Vineet Gupta --- arch/arc/kernel/unwind.c | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/arch/arc/kernel/unwind.c b/arch/arc/kernel/unwind.c index 9f5ed6873c52..9b34038a7582 100644 --- a/arch/arc/kernel/unwind.c +++ b/arch/arc/kernel/unwind.c @@ -900,35 +900,16 @@ int arc_unwind(struct unwind_frame_info *frame) return -EINVAL; hdr = table->header; + if (hdr == NULL) + return -EINVAL; - smp_rmb(); - if (hdr && hdr->version == 1) { - switch (hdr->table_enc & DW_EH_PE_FORM) { - case DW_EH_PE_native: - hdrEntrySz = sizeof(unsigned long); - break; - case DW_EH_PE_data2: - hdrEntrySz = 2; - break; - case DW_EH_PE_data4: - hdrEntrySz = 4; - break; - case DW_EH_PE_data8: - hdrEntrySz = 8; - break; - default: - hdrEntrySz = 0; - break; - } + hdrEntrySz = sizeof(unsigned long); + BUILD_BUG_ON(hdrEntrySz != sizeof(hdr->table[0].start)); + + ptr = (const u8*)(hdr->table); + end = (const u8*)(hdr) + table->hdrsz; + i = hdr->fde_count; - ptr = (const u8*)(hdr->eh_frame_ptr); - end = (const u8*)(hdr) + table->hdrsz; - if (hdrEntrySz - && read_pointer(&ptr, end, hdr->eh_frame_ptr_enc) /* eh_frame_ptr */ - == (unsigned long)table->address - && (i = read_pointer(&ptr, end, hdr->fde_count_enc)) > 0 /* fde_count */ - && i == (end - ptr) / (2 * hdrEntrySz) - && !((end - ptr) % (2 * hdrEntrySz))) { do { const u8 *cur = ptr + (i / 2) * (2 * hdrEntrySz); @@ -944,8 +925,6 @@ int arc_unwind(struct unwind_frame_info *frame) && (startLoc = read_pointer(&ptr, ptr + hdrEntrySz, hdr->table_enc)) != 0 && pc >= startLoc) fde = (void *)read_pointer(&ptr, ptr + hdrEntrySz, hdr->table_enc); - } - } if (fde != NULL) { cie = cie_for_fde(fde, table);