From patchwork Sat Sep 16 03:53:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 9954117 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B1CA7601E8 for ; Sat, 16 Sep 2017 03:59:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A42CE29238 for ; Sat, 16 Sep 2017 03:59:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9853F2922D; Sat, 16 Sep 2017 03:59:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 475382922D for ; Sat, 16 Sep 2017 03:59:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751907AbdIPD64 (ORCPT ); Fri, 15 Sep 2017 23:58:56 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33060 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880AbdIPD6x (ORCPT ); Fri, 15 Sep 2017 23:58:53 -0400 Received: by mail-pg0-f68.google.com with SMTP id i130so2252888pgc.0; Fri, 15 Sep 2017 20:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OfRmoCKaZTxH76f85Hvnq8h3YMNL73s6OtfMeyJchEA=; b=ihzKPt2JNphNcRhzF55U+ViPAtPrQmrI4I8wS+uNzN58qPLY5oP3FWev2QdTmCt1h8 s7JnP2zWINouAfPuaeoP1QXqNPESvMKATqc0+QIYSeDQ9VxzQzPng1sETMy6vwziSOFm tE9W6TFPC9Bww4gwudoAVpBeuYnSrjaKtBXvhLTNIw1GdqofUeYrcomKjQXkoggrHI08 iJ6h4pAsD7NVc2XbPEbJX9qVT9rZZHPY6Tp7255fOc0VB+xW1Ici3AXwihBPaahFpjb2 uqi6sGgghRXeWHQddHwcAsgzwZSBRDf4Gohtsh5gB4cqx34se+4ItzqwU73DrnW6wJnT DHXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OfRmoCKaZTxH76f85Hvnq8h3YMNL73s6OtfMeyJchEA=; b=emUy+YWfx8fFy/w8qa+/WpnzSgA/XopOHwDc43iJ/4HJBJuLk5o6m/EqmAsH/HvgZO jPQwQWo7fx5FWfvWygdaFp7DSn6FPMyNSZo5HrEXpXRpwDLJh5uMVakmJUE1sg4HUYKo 2rK486a9uPv5aa+2fq47UJGU49XT91A7qE9dMSceN1IzyCpPA2ocEmNoKbeuiOXRfRax EIkthyqj/sptVchd45DGli6e3hK38U4S/q5RntM9ZfvcekdGOxRvUGGsQxScVr6cMlvQ tWnXBxzA4uiXOBMZKNZTFj7sx+Gu3pUsN3Hy1SPhtXrl8m2IRAMr3wnwwf4qZBq1IlDx Op4w== X-Gm-Message-State: AHPjjUhtHJEBtNXYf5pooYmaSQw+iNV4bJG5dkp574hBOCawODrHfeTw ACzIEhECSUtBxQ== X-Google-Smtp-Source: ADKCNb5+5Kec3ncfrrAw+emYdbKrMNgzOmgON9Y0elrR2xm82eoL2rFLeoBQGYifIqWj24otNRYx4g== X-Received: by 10.84.225.2 with SMTP id t2mr30313733plj.425.1505534332715; Fri, 15 Sep 2017 20:58:52 -0700 (PDT) Received: from localhost.localdomain ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id 76sm4448230pfp.158.2017.09.15.20.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 20:58:52 -0700 (PDT) From: Sergey Senozhatsky To: Tony Luck , Fenghua Yu , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "James E . J . Bottomley" , Helge Deller Cc: Petr Mladek , Steven Rostedt , Andrew Morton , Jessica Yu , Alexei Starovoitov , linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH 2/5] ia64: Add .opd based function descriptor dereference Date: Sat, 16 Sep 2017 12:53:44 +0900 Message-Id: <20170916035347.19705-3-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170916035347.19705-1-sergey.senozhatsky@gmail.com> References: <20170916035347.19705-1-sergey.senozhatsky@gmail.com> Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We are moving towards separate kernel and module function descriptor dereference callbacks. This patch enables it for IA64. For pointers that belong to the kernel - Added __start_opd and __end_opd pointers, to track the kernel .opd section address range; - Added dereference_kernel_function_descriptor(). Now we will dereference only function pointers that are within [__start_opd, __end_opd]; For pointers that belong to a module - Added dereference_module_function_descriptor() to handle module function descriptor dereference. Now we will dereference only pointers that are within [module->opd.start, module->opd.end]. Signed-off-by: Sergey Senozhatsky --- arch/ia64/include/asm/sections.h | 14 +++++++++++++- arch/ia64/kernel/module.c | 13 +++++++++++++ arch/ia64/kernel/vmlinux.lds.S | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h index 2ab2003698ef..bff3f3535609 100644 --- a/arch/ia64/include/asm/sections.h +++ b/arch/ia64/include/asm/sections.h @@ -25,8 +25,11 @@ extern char __start_gate_fsyscall_patchlist[], __end_gate_fsyscall_patchlist[]; extern char __start_gate_brl_fsys_bubble_down_patchlist[], __end_gate_brl_fsys_bubble_down_patchlist[]; extern char __start_unwind[], __end_unwind[]; extern char __start_ivt_text[], __end_ivt_text[]; +extern char __start_opd[], __end_opd[]; #undef dereference_function_descriptor +#undef dereference_kernel_function_descriptor + static inline void *dereference_function_descriptor(void *ptr) { struct fdesc *desc = ptr; @@ -37,6 +40,15 @@ static inline void *dereference_function_descriptor(void *ptr) return ptr; } +static inline void *dereference_kernel_function_descriptor(void *ptr) +{ + /* + * Check if the ptr is a function descriptor and thus needs to + * be dereferenced. + */ + if (ptr < (void *)__start_opd || (void *)__end_opd < ptr) + return ptr; + return dereference_function_descriptor(ptr); +} #endif /* _ASM_IA64_SECTIONS_H */ - diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c index d1d945c6bd05..d42f1e19d75d 100644 --- a/arch/ia64/kernel/module.c +++ b/arch/ia64/kernel/module.c @@ -35,6 +35,7 @@ #include #include +#include #define ARCH_MODULE_DEBUG 0 @@ -917,3 +918,15 @@ module_arch_cleanup (struct module *mod) if (mod->arch.core_unw_table) unw_remove_unwind_table(mod->arch.core_unw_table); } + +unsigned long dereference_module_function_descriptor(struct module *mod, + unsigned long addr) +{ + Elf64_Shdr *opd = mod->arch.opd; + + if (addr < opd->sh_addr || + (opd->sh_addr + opd->sh_size) < addr) + return addr; + + return dereference_function_descriptor(addr); +} diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 798026dde52e..f872ba5ff82a 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S @@ -107,7 +107,9 @@ SECTIONS { RODATA .opd : AT(ADDR(.opd) - LOAD_OFFSET) { + __start_opd = .; *(.opd) + __end_opd = .; } /*