From patchwork Sat Sep 16 03:53:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 9954111 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 2EF19603B4 for ; Sat, 16 Sep 2017 03:59:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 210812922D for ; Sat, 16 Sep 2017 03:59:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15C2729287; Sat, 16 Sep 2017 03:59:24 +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 B4F7929238 for ; Sat, 16 Sep 2017 03:59:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751576AbdIPD7J (ORCPT ); Fri, 15 Sep 2017 23:59:09 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:37050 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbdIPD7E (ORCPT ); Fri, 15 Sep 2017 23:59:04 -0400 Received: by mail-pg0-f65.google.com with SMTP id v5so2244229pgn.4; Fri, 15 Sep 2017 20:59:04 -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=pbzYOzxbOw6DTwzifZOrQKTCkzmMvM1AuZ6bZBhn/8I=; b=B9yS/sQadvK96q1aIc5hTaldbqGJxKmWOZVclkuWvDhvllUkDv+5wFFmCKpgn1cLAA H7x9e98ZIsQ419oDJTJOLNfBYbEsPb/JH/HTuykLHWC5G0jZPQlpDkXFK5An/HMo5XUZ OD6OOc3LTqA1qF0EgGHjQGttdLlEccIX56KeA/MP80uN8d2RWuiP9IE5wuatW+QzCCK4 sOMICC26mnYTXqWayqsA4IACV674ytavudrLB4ND1rmxXKlm3k1Sknzz82CEDunNamzv DCQ/HJiGSRSkWJ2JkQ7qTpyjJGeALAgDZfwJTjxTyDkvtYspdsruMEx98/CovfT/c3xd 2Y/A== 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=pbzYOzxbOw6DTwzifZOrQKTCkzmMvM1AuZ6bZBhn/8I=; b=ItWRyH/T4CH2TW1sl/6BUmPgOjgGdHT1hyjoWwApFZMbR0YmDjnpl2dZTIqE9itPWC mOlosiG4FtvRkZbiv2xJoNqwQgqbmjtQlvQr/3DerjQ1AoxOrnfK70Ag2+Np+ETR3pEq 8yeNSQHeTwFa2z+OCsTgz021Dq+bixzM7sLRTTOom9417HVI10194pQ3polQgas0wO20 3ML3v3hgobIoFm5EpsDQK9OVOI5gK5/wmvzWz8DqG2HcA7gWXloNRVQltMCvEqwOiZqt wWC8gFGQLY7mKBXxGjA/I1OTLUWX7XVp28N632vL3fHKrdE5F4IZBsXzqHvbv3PQLnIr VGHw== X-Gm-Message-State: AHPjjUhjjXeT2NrDas/WEBYNIWry/XT4uD8RgY29ZK6/qBCoPGoAwR2b D08W4XWFEESRLQ== X-Google-Smtp-Source: ADKCNb72JBLpCpXAZRIhvidNNJivAjezU/LFSmdoHpDu8p3KLbsGSzVCVXfc4iL0d9r2cUj11lkcHA== X-Received: by 10.99.126.84 with SMTP id o20mr26925543pgn.293.1505534343684; Fri, 15 Sep 2017 20:59:03 -0700 (PDT) Received: from localhost.localdomain ([121.137.63.184]) by smtp.gmail.com with ESMTPSA id 76sm4448230pfp.158.2017.09.15.20.58.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 20:59:03 -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 4/5] parisc64: Add .opd based function descriptor dereference Date: Sat, 16 Sep 2017 12:53:46 +0900 Message-Id: <20170916035347.19705-5-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 parisc64. 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/parisc/boot/compressed/vmlinux.lds.S | 2 ++ arch/parisc/include/asm/sections.h | 3 +++ arch/parisc/kernel/module.c | 14 ++++++++++++++ arch/parisc/kernel/process.c | 10 ++++++++++ arch/parisc/kernel/vmlinux.lds.S | 2 ++ 5 files changed, 31 insertions(+) diff --git a/arch/parisc/boot/compressed/vmlinux.lds.S b/arch/parisc/boot/compressed/vmlinux.lds.S index a4ce3314e78e..4ebd4e65524c 100644 --- a/arch/parisc/boot/compressed/vmlinux.lds.S +++ b/arch/parisc/boot/compressed/vmlinux.lds.S @@ -29,7 +29,9 @@ SECTIONS . = ALIGN(16); /* Linkage tables */ .opd : { + __start_opd = .; *(.opd) + __end_opd = .; } PROVIDE (__gp = .); .plt : { *(.plt) diff --git a/arch/parisc/include/asm/sections.h b/arch/parisc/include/asm/sections.h index 9d13c3507ad6..e3cde650b2f9 100644 --- a/arch/parisc/include/asm/sections.h +++ b/arch/parisc/include/asm/sections.h @@ -6,7 +6,10 @@ #ifdef CONFIG_64BIT #undef dereference_function_descriptor +#undef dereference_kernel_function_descriptor + void *dereference_function_descriptor(void *); +void *dereference_kernel_function_descriptor(void *); #endif #endif diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index f1a76935a314..bc2eae8634fd 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c @@ -954,3 +954,17 @@ void module_arch_cleanup(struct module *mod) { deregister_unwind_table(mod); } + +#ifdef CONFIG_64BIT +unsigned long dereference_module_function_descriptor(struct module *mod, + unsigned long addr) +{ + void *opd_sz = mod->arch.fdesc_offset + + mod->arch.fdesc_max * sizeof(Elf64_Fdesc); + + if (addr < mod->arch.fdesc_offset || opd_sz < addr) + return addr; + + return dereference_function_descriptor(addr); +} +#endif diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index 30f92391a93e..f30776bdaa79 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -267,6 +267,8 @@ get_wchan(struct task_struct *p) } #ifdef CONFIG_64BIT +extern char __start_opd[], __end_opd[]; + void *dereference_function_descriptor(void *ptr) { Elf64_Fdesc *desc = ptr; @@ -276,6 +278,14 @@ void *dereference_function_descriptor(void *ptr) ptr = p; return ptr; } + +void *dereference_kernel_function_descriptor(void *ptr) +{ + if (ptr < (void *)__start_opd || (void *)__end_opd < ptr) + return ptr; + + return dereference_function_descriptor(ptr); +} #endif static inline unsigned long brk_rnd(void) diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index ffe2cbf52d1a..ab030895dd1e 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -99,7 +99,9 @@ SECTIONS . = ALIGN(16); /* Linkage tables */ .opd : { + __start_opd = .; *(.opd) + __end_opd = .; } PROVIDE (__gp = .); .plt : { *(.plt)