From patchwork Wed Jan 6 15:54:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 59255 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp8470lbb; Wed, 6 Jan 2016 07:56:45 -0800 (PST) X-Received: by 10.66.253.5 with SMTP id zw5mr83994347pac.100.1452095805818; Wed, 06 Jan 2016 07:56:45 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sl3si2509342pac.220.2016.01.06.07.56.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2016 07:56:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGqQn-0000Kw-Fi; Wed, 06 Jan 2016 15:55:25 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aGqQi-0007Va-P9 for linux-arm-kernel@lists.infradead.org; Wed, 06 Jan 2016 15:55:22 +0000 Received: by mail-wm0-x22c.google.com with SMTP id b14so81719981wmb.1 for ; Wed, 06 Jan 2016 07:54:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Ic6thuJQ5mnjRYnsAI/TLagUa6wYmYjt9XrL1BZ08XI=; b=E7fF2N9kn75rKxA+83vUEaxXD4P2E39WYArZsuodE0bbmvx4jLb3bJpkYgd3ntX9Ki J6/8TnA8/Vz4KBD1q6h6099yyvzn6/goIMpaUhwywOl4utE2jw+56t/fVxRsHpvd5Hfw jKGtPcLCxseRx/meFIzBL7VHVk6jdsvY0Mb4E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ic6thuJQ5mnjRYnsAI/TLagUa6wYmYjt9XrL1BZ08XI=; b=G23pUDl7FwRKI+OJV27Lzx0mql5EzikNne7tFqyYb65Y7iSvZBOYCmOCx35HHpviol x8CG96/hF/nPcqYznx/N+d31IOZIkKfzT9wTsfuh2VRO1/PFl7prxp96NFQEEAGQX5k1 4BRXL+CFPe24vLitAlRFVzuBk2OHzgrygmaZi69fLDguqAsXMUp4mPjA16w/VdIiWqi1 tWBJsum2P+4A+LJZe8ZTFcfSFSHKdoguZ0bq5ZfGRLycLUxQcUXu1BClSaNNdDGnNmHA 4u5iS8KaPo52QyDiTcUIF3xWsUOG4vwkMX+4alJ7OYBc4vFGsdP5LZUNp2oUF4NvwfLu Fa+w== X-Gm-Message-State: ALoCoQmG8NRfMuRSJbZZBKoGWocXfemeuSxvJTsIYu3lGvUHoX0TWT1e8H79IOxtiB7bRLbWSlx53IwZ2+7vrFkTQPiNEa5Oag== X-Received: by 10.194.115.67 with SMTP id jm3mr109022341wjb.9.1452095698670; Wed, 06 Jan 2016 07:54:58 -0800 (PST) Received: from localhost.localdomain (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by smtp.gmail.com with ESMTPSA id g3sm96540050wjw.31.2016.01.06.07.54.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jan 2016 07:54:57 -0800 (PST) From: Ard Biesheuvel To: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, ryabinin.a.a@gmail.com, catalin.marinas@arm.com, mingo@kernel.org Subject: [PATCH] mm/kasan: map KASAN zero page read only Date: Wed, 6 Jan 2016 16:54:47 +0100 Message-Id: <1452095687-18136-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160106_075521_195834_32C1713C X-CRM114-Status: GOOD ( 11.55 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22c listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org The original x86_64-only version of KASAN mapped its zero page read-only, but this got lost when the code was generalised and ported to arm64, since, at the time, the PAGE_KERNEL_RO define did not exist. It has been added to arm64 in the mean time, so let's use it. Signed-off-by: Ard Biesheuvel --- mm/kasan/kasan_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/mm/kasan/kasan_init.c b/mm/kasan/kasan_init.c index 3f9a41cf0ac6..8726a92604ad 100644 --- a/mm/kasan/kasan_init.c +++ b/mm/kasan/kasan_init.c @@ -49,7 +49,7 @@ static void __init zero_pte_populate(pmd_t *pmd, unsigned long addr, pte_t *pte = pte_offset_kernel(pmd, addr); pte_t zero_pte; - zero_pte = pfn_pte(PFN_DOWN(__pa(kasan_zero_page)), PAGE_KERNEL); + zero_pte = pfn_pte(PFN_DOWN(__pa(kasan_zero_page)), PAGE_KERNEL_RO); zero_pte = pte_wrprotect(zero_pte); while (addr + PAGE_SIZE <= end) {