From patchwork Thu Jan 17 00:32:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgecombe, Rick P" X-Patchwork-Id: 10767267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 099A114E5 for ; Thu, 17 Jan 2019 00:34:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A2E32DDDC for ; Thu, 17 Jan 2019 00:34:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E5CF2DE41; Thu, 17 Jan 2019 00:34:17 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4FD72DFD8 for ; Thu, 17 Jan 2019 00:34:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B4878E000E; Wed, 16 Jan 2019 19:33:41 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 86B538E0013; Wed, 16 Jan 2019 19:33:41 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C71F8E000F; Wed, 16 Jan 2019 19:33:41 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id BDD468E0005 for ; Wed, 16 Jan 2019 19:33:40 -0500 (EST) Received: by mail-pl1-f198.google.com with SMTP id g13so4943423plo.10 for ; Wed, 16 Jan 2019 16:33:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=se2UgweWDUv6UvpNReMwED+7UCj9/063SvA/PxiU/I8=; b=WQtE6AM3Toywkf09rgFDv0K0ZwnRA7iub0hxN4+yZ+z071R5Qo57SDqasPYtsp2grK WiCBdgIIxvzPx1O8T8cjhwvM+QXveoIxojkLlkIWchAe5oWXuKmB1AN4iCiN/SMnyvwb KQu/waI2QpIUND1PL6lTne88rV0FNh8VgJElpOAD7IbVgDYq76u9KK0OrcXq5YYkfAaO s26iJD2iWQVnkKK1tzCiqSTjI9BgPn1Zvq69Vk2p/uM1BFZTmKEptf7/NVPrkHzI10jC h7/zszqmf+Q5xSNFBS9ygkRXnY2Kv2rcdly4p4KgH6tSbN+it3jOwN6AlBTw5q4Fle4g w9Eg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AJcUukcFNK/FBA0ph+aVAWkglUs2WEV1IyMrfUbywUgwG3wqf6SOCRZ7 spiFbNHubPNKcloAwMiJ3CLknnUR/6mfbs885pyNRXJol2wy6C6SPIbdrp8YrlqpB8NtdXNdcGH X2fo4VwzMC1Xx91tj63rAPDcN4u64fwaUVdqwNEvVeEG8jLJoNzj9gTXKG0b/Pkuq4A== X-Received: by 2002:a63:111c:: with SMTP id g28mr11295251pgl.85.1547685220430; Wed, 16 Jan 2019 16:33:40 -0800 (PST) X-Google-Smtp-Source: ALg8bN4U65x3pdhZBLz+CiW0+YLQUKLOc7jD+dCwV8vssPUcndp8eqNiFkOsVubo1aKLiBrRrTyn X-Received: by 2002:a63:111c:: with SMTP id g28mr11295192pgl.85.1547685219609; Wed, 16 Jan 2019 16:33:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547685219; cv=none; d=google.com; s=arc-20160816; b=uULQ3t2lkzGBJyPGCgKiU+9oI1wWM6IPnmNDFFI+hoOnKg+KXXk6g3Nri4ZbwICwaJ WETjd+BXRHuIZ550oADAfqnVL0+eC6z1MVM/cpA2VQnJZLX+EL9dHB+0mYrfIXE+BFzm ZP7HDSEMt1sStOEmIKbmyfJkBScui+uRTXi3z6snABNMlXIfsdEJdA28ErOksnRtsFho BluUTWdi6e/8jSLjoXE2ZiMwGEJ1hfq+G8Ldhtnxw43Aay1OqXuwhTzd5YzJOirIACdR xvNH4Dplv9yXkcu8wheBFtjSKJA/bEIsOBZeotaPkWEOy4409ghw4U/9/xfLrDDO5eAs ChAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=se2UgweWDUv6UvpNReMwED+7UCj9/063SvA/PxiU/I8=; b=V1uiTZqEh+OJ/WBlYcSd+Syx/5EV1O1JqpMNPNgYc0mjoM0mqwbYzszL3iZ+OZ+pDy nh/a0eRUZ2ZJFwQYDMi3Vz3nJXvWIGyfGXmnbJy6ic6gLP3p8rorYQVql4Az9uS9tYVW gNkxN79jce4s0Nu8UYhMYyThb4zLpOa+2xp5rtAyOfZwpmm6YrA/plsnrEAaJIeWBS/k WdGoFjdyLYRww6vM/lpvgBM8IIcHosHsw8vTSYhr/6DUHS7z0tSj+GQL529YMO65zqoB HIkyUwdkbliem4EeT1wrlp3iynh30lBYcd45pc88DahUJtzYmlurMIb48nYgC9wFaWP4 hO4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id 1si7848435plo.195.2019.01.16.16.33.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 16:33:39 -0800 (PST) Received-SPF: pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: domain of rick.p.edgecombe@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=rick.p.edgecombe@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 16:33:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="292166048" Received: from rpedgeco-desk5.jf.intel.com ([10.54.75.79]) by orsmga005.jf.intel.com with ESMTP; 16 Jan 2019 16:33:36 -0800 From: Rick Edgecombe To: Andy Lutomirski , Ingo Molnar Cc: linux-kernel@vger.kernel.org, x86@kernel.org, hpa@zytor.com, Thomas Gleixner , Borislav Petkov , Nadav Amit , Dave Hansen , Peter Zijlstra , linux_dti@icloud.com, linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, akpm@linux-foundation.org, kernel-hardening@lists.openwall.com, linux-mm@kvack.org, will.deacon@arm.com, ard.biesheuvel@linaro.org, kristen@linux.intel.com, deneen.t.dock@intel.com, Nadav Amit , Kees Cook , Dave Hansen , Masami Hiramatsu , Rick Edgecombe Subject: [PATCH 12/17] x86/alternative: Remove the return value of text_poke_*() Date: Wed, 16 Jan 2019 16:32:54 -0800 Message-Id: <20190117003259.23141-13-rick.p.edgecombe@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190117003259.23141-1-rick.p.edgecombe@intel.com> References: <20190117003259.23141-1-rick.p.edgecombe@intel.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Nadav Amit The return value of text_poke_early() and text_poke_bp() is useless. Remove it. Cc: Andy Lutomirski Cc: Kees Cook Cc: Peter Zijlstra Cc: Dave Hansen Cc: Masami Hiramatsu Signed-off-by: Nadav Amit Signed-off-by: Rick Edgecombe --- arch/x86/include/asm/text-patching.h | 4 ++-- arch/x86/kernel/alternative.c | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h index a75eed841eed..c90678fd391a 100644 --- a/arch/x86/include/asm/text-patching.h +++ b/arch/x86/include/asm/text-patching.h @@ -18,7 +18,7 @@ static inline void apply_paravirt(struct paravirt_patch_site *start, #define __parainstructions_end NULL #endif -extern void *text_poke_early(void *addr, const void *opcode, size_t len); +extern void text_poke_early(void *addr, const void *opcode, size_t len); /* * Clear and restore the kernel write-protection flag on the local CPU. @@ -37,7 +37,7 @@ extern void *text_poke_early(void *addr, const void *opcode, size_t len); extern void *text_poke(void *addr, const void *opcode, size_t len); extern void *text_poke_kgdb(void *addr, const void *opcode, size_t len); extern int poke_int3_handler(struct pt_regs *regs); -extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler); +extern void text_poke_bp(void *addr, const void *opcode, size_t len, void *handler); extern int after_bootmem; extern __ro_after_init struct mm_struct *poking_mm; extern __ro_after_init unsigned long poking_addr; diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 18415e3b6000..2740ad2c6f21 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -264,7 +264,7 @@ static void __init_or_module add_nops(void *insns, unsigned int len) extern struct alt_instr __alt_instructions[], __alt_instructions_end[]; extern s32 __smp_locks[], __smp_locks_end[]; -void *text_poke_early(void *addr, const void *opcode, size_t len); +void text_poke_early(void *addr, const void *opcode, size_t len); /* * Are we looking at a near JMP with a 1 or 4-byte displacement. @@ -666,8 +666,8 @@ void __init alternative_instructions(void) * instructions. And on the local CPU you need to be protected again NMI or MCE * handlers seeing an inconsistent instruction while you patch. */ -void *__init_or_module text_poke_early(void *addr, const void *opcode, - size_t len) +void __init_or_module text_poke_early(void *addr, const void *opcode, + size_t len) { unsigned long flags; @@ -690,7 +690,6 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode, * that causes hangs on some VIA CPUs. */ } - return addr; } __ro_after_init struct mm_struct *poking_mm; @@ -893,7 +892,7 @@ int poke_int3_handler(struct pt_regs *regs) * replacing opcode * - sync cores */ -void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler) +void text_poke_bp(void *addr, const void *opcode, size_t len, void *handler) { unsigned char int3 = 0xcc; @@ -935,7 +934,5 @@ void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler) * the writing of the new instruction. */ bp_patching_in_progress = false; - - return addr; }