From patchwork Thu Apr 6 03:35:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eddie Kovsky X-Patchwork-Id: 9666011 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 C6428602B8 for ; Thu, 6 Apr 2017 03:37:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B565B28304 for ; Thu, 6 Apr 2017 03:37:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A95FA28573; Thu, 6 Apr 2017 03:37:43 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 2DEE728304 for ; Thu, 6 Apr 2017 03:37:41 +0000 (UTC) Received: (qmail 9269 invoked by uid 550); 6 Apr 2017 03:37:39 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 9245 invoked from network); 6 Apr 2017 03:37:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=edkovsky.org; s=mail; t=1491449847; bh=g0cdSnHizRGhqyAQWIcp8druYOrVj3/1a4iV9iz24zI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WXUegXIlSnqu95+X75hb8Dk4O59JpmD+roTpdPaUZGVCpSfyB3/rEI+bHxy8vhnnt U10XP+yhJvHCFjQdBLqsu7CCWTgiKgjViwsporjUwWD45tsEpHWtvVoMUARFdXziVA 3EGMYF1o4Cwi3dZ7Jfj2K1Sq46sJF2HVt736qXXY= From: Eddie Kovsky To: jeyu@redhat.com, rusty@rustcorp.com.au, keescook@chromium.org Cc: linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Date: Wed, 5 Apr 2017 21:35:50 -0600 Message-Id: <20170406033550.32525-3-ewk@edkovsky.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170406033550.32525-1-ewk@edkovsky.org> References: <20170406033550.32525-1-ewk@edkovsky.org> X-Virus-Scanned: clamav-milter 0.99.2 at olympus X-Virus-Status: Clean Subject: [kernel-hardening] [PATCH v5 2/2] extable: verify address is read-only X-Virus-Scanned: ClamAV using ClamSMTP Provide a mechanism to check if the address of a variable is const or ro_after_init. It mimics the existing functions that test if an address is inside the kernel's text section. The idea is to prevent structures that are not read-only from being passed to functions. Other functions inside the kernel could then use this capability to verify that their arguments are read-only. This implements the first half of a suggestion made by Kees Cook for the Kernel Self Protection Project: - provide mechanism to check for ro_after_init memory areas, and reject structures not marked ro_after_init in vmbus_register() Suggested-by: Kees Cook Signed-off-by: Eddie Kovsky --- Changes in v5: - Replace __start_data_ro_after_init with __start_ro_after_init - Replace __end_data_ro_after_init with __end_ro_after_init Changes in v4: - Rename function core_kernel_ro_data() to core_kernel_rodata(). Changes in v3: - Fix missing declaration of is_module_rodata_address() --- include/linux/kernel.h | 2 ++ kernel/extable.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 4c26dc3a8295..5748784ca209 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -444,6 +444,8 @@ extern int core_kernel_data(unsigned long addr); extern int __kernel_text_address(unsigned long addr); extern int kernel_text_address(unsigned long addr); extern int func_ptr_is_kernel_text(void *ptr); +extern int core_kernel_rodata(unsigned long addr); +extern int kernel_ro_address(unsigned long addr); unsigned long int_sqrt(unsigned long); diff --git a/kernel/extable.c b/kernel/extable.c index 2676d7f8baf6..18c5e4dbe0fc 100644 --- a/kernel/extable.c +++ b/kernel/extable.c @@ -154,3 +154,32 @@ int func_ptr_is_kernel_text(void *ptr) return 1; return is_module_text_address(addr); } + +/** + * core_kernel_rodata - Verify address points to read-only section + * @addr: address to test + * + */ +int core_kernel_rodata(unsigned long addr) +{ + if (addr >= (unsigned long)__start_rodata && + addr < (unsigned long)__end_rodata) + return 1; + + if (addr >= (unsigned long)__start_ro_after_init && + addr < (unsigned long)__end_ro_after_init) + return 1; + + return 0; +} + +/* Verify that address is const or ro_after_init. */ +int kernel_ro_address(unsigned long addr) +{ + if (core_kernel_rodata(addr)) + return 1; + if (is_module_rodata_address(addr)) + return 1; + + return 0; +}