Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp236890ybp; Thu, 10 Oct 2019 17:13:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzCq3mVyfFG5LaotRnVV7IReazN4LE/Sj7twfLp4mmMR0UmkD0jQf+YvK3M6nwzAiae6135 X-Received: by 2002:a17:906:c78e:: with SMTP id cw14mr10712703ejb.67.1570752822704; Thu, 10 Oct 2019 17:13:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570752822; cv=none; d=google.com; s=arc-20160816; b=ftzXLv0ZopWKEnMIzS7DjQ+wv+NhYuiwniwXdCvHsZeGRgwKX9FRyE5PPg7+RlN9R1 L0rFBewT6RxTlKSA9fFI+R7wDrwet2bOeVwyY1UlcJp44O7w2xG8tlpuwkC+XvCHXlyu 6tV4Wy7oDhJ8QBR72GIzkZ6grsnirSTUQd4DKV4b9V8Jx5dDtzuT+2JKBLFi1X6An+fz Sa8Lh9cjOuDWglxVsylbB/x8rYaf79urNc7rxKfvOJ59VEDiMpYMx+ZLPMd8lsaqDcB6 1JjVKR2SA5485wzD1dG9nbzVvT8P2gqEFEDgrSFrMt0aebFkmWmWjm+ghP4z+lWLdqq0 UShQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=8/x+eaVk+ss1aFRFRC2BuuTBFLP58LLEcIBPNJoL2cs=; b=od6F9+PcJv54iNX4GFO51qoI5MwV+mfYRVRvx7Z0O+RyFUNP9d2lK9UMfyREPuMIsv 9FCcd1gCqezekEOG1+/DUcC62SGJpC7tQKr6mDvx+sOktZ+O6IPKgiaX3VbjuUnAz9ii FgvC39+2IB/4cTj0iS7UiguVSP1KEogYQLF1YFAHRg6KwEqGs0FzaFnzHPP2IEyfmo8A QzMIhsZGPhzAYbrWZsUUE958EJhQNvC+BiG8FkoH+XOMpbw/GR/jLPZiBP8IQcYq88PI gsRHsDxQaQarsioepAiOccRzB3mZiqktTHd7WmjQ8JEImxRwD/UX4WjrAfZF5yBnOMJv WnHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fp0EZsT2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r24si4284467ejs.166.2019.10.10.17.13.19; Thu, 10 Oct 2019 17:13:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=fp0EZsT2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727816AbfJKANF (ORCPT + 99 others); Thu, 10 Oct 2019 20:13:05 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:44088 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727746AbfJKAND (ORCPT ); Thu, 10 Oct 2019 20:13:03 -0400 Received: by mail-pf1-f195.google.com with SMTP id q21so4931475pfn.11 for ; Thu, 10 Oct 2019 17:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8/x+eaVk+ss1aFRFRC2BuuTBFLP58LLEcIBPNJoL2cs=; b=fp0EZsT2tyBJy4pMM0BrQdWNH3jIqPiiR0OFuPR3KKp9NlEmrHQgmL/ZBNM1hxDEVj gMnsWemWjREXcL9c9lek/rM89s9e/l7HiEkBH/KqKwR6byArefKYaaiKWxjJgqllWaPD 6nPt+boxm7/SK9xvW9TYHnHh28YvJaU9w+77g= 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=8/x+eaVk+ss1aFRFRC2BuuTBFLP58LLEcIBPNJoL2cs=; b=bVs/HIdzRAoNiZS9pmGWcY7Li8vzntr/ob6VHz1LwqoLs1FVm+f6DJJdwAFzZO7pFs /hHkY06LjsP9fdNmHQmo7SzrmzrzPT+APkJJJwIpvJ7eb2UTfcfyN35NdERxIyewtLAK +2sK/jbFoDMINlcongpslWHwliZeyVUk4TeKRUZZUcDkXuJdvFc95FAWi/8OI3ewKD9T uuaoyqPAoJ2SgNNhsg9o6qugu8ugG+d/uNG3CMnh1d5FlMVAgC4p0kXC2XxPFLKfP/UU jZuqEfAC+n7KIuIlpm++H8ln8YYEv5uQ0D0m6DAXdjK0jRmutnyaoxy4b+zVu5saWlQQ 8Xfw== X-Gm-Message-State: APjAAAV1nerZ26zYgawr248FVqE7qVEUiwmwOG2QAb8T6qVVLaCpZQMD FD4Oe+IKICPEyOtSyIt2wPNtFg== X-Received: by 2002:a63:2350:: with SMTP id u16mr1550233pgm.103.1570752782606; Thu, 10 Oct 2019 17:13:02 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id q36sm7238812pgb.34.2019.10.10.17.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2019 17:12:56 -0700 (PDT) From: Kees Cook To: Borislav Petkov Cc: Kees Cook , Rick Edgecombe , Dave Hansen , Andy Lutomirski , Arnd Bergmann , Michael Ellerman , Heiko Carstens , Will Deacon , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-alpha@vger.kernel.org, linux-ia64@vger.kernel.org, linux-s390@vger.kernel.org, linux-c6x-dev@linux-c6x.org, Yoshinori Sato , Michal Simek , linux-parisc@vger.kernel.org, linux-xtensa@linux-xtensa.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 26/29] x86/mm: Remove redundant &s on addresses Date: Thu, 10 Oct 2019 17:06:06 -0700 Message-Id: <20191011000609.29728-27-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011000609.29728-1-keescook@chromium.org> References: <20191011000609.29728-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The &s on addresses are redundant. Remove them to match all the other similar functions. Signed-off-by: Kees Cook --- arch/x86/mm/init_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 26299e9ce6da..e67ddca8b7a8 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1300,9 +1300,9 @@ void mark_rodata_ro(void) { unsigned long start = PFN_ALIGN(_text); unsigned long rodata_start = PFN_ALIGN(__start_rodata); - unsigned long end = (unsigned long) &__end_rodata_hpage_align; - unsigned long text_end = PFN_ALIGN(&_etext); - unsigned long rodata_end = PFN_ALIGN(&__end_rodata); + unsigned long end = (unsigned long)__end_rodata_hpage_align; + unsigned long text_end = PFN_ALIGN(_etext); + unsigned long rodata_end = PFN_ALIGN(__end_rodata); unsigned long all_end; printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n", -- 2.17.1