From patchwork Wed Apr 25 06:26:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 134232 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp471288lji; Tue, 24 Apr 2018 23:27:43 -0700 (PDT) X-Google-Smtp-Source: AIpwx48wKe+wt9Hn1nv0z8POQK10sJBK24PL93IgJFwhLIjVzsjbm4tQg30KpyquWc4lGlhA7N4M X-Received: by 10.98.87.150 with SMTP id i22mr26998627pfj.119.1524637663047; Tue, 24 Apr 2018 23:27:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524637663; cv=none; d=google.com; s=arc-20160816; b=dpUXQUNEAQlO7LPspjLUBCrpVASycpDNbtY2VvZUmBrFKVeaSRfqXZynQchga98Y2n sAgaYHLKNvX3E4LpBlv+fcNZ4HrE5t7qoxGdQx+EVC/qxsCTqkd8F6MKtx7SYrWfZmC9 5xWx25+7oyaqYQvg4bSATMbOzaiM5ksUBFm4R+a7F9rsY9Z8lyNqAg/P8QLQhWUTyNZ8 B890edr+HF2kgYERWLDOWhAVfAf4wS9pUJSRWQHSZExEVUaOVuqdUWzkUwYAF+a1Vi29 ODA1YljCFlbhuIsZwBS+ixmtEf4oS/CAbs38JPCDT4SAHYP9+R3ejo6Q9fmjx+8lZShL VMLA== 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:arc-authentication-results; bh=jBK3ptBP+kuxlmMWHAiBOcRa6D76/Wey0R++OHp+zjo=; b=JtT6Ew5o+ydkeeXtf6LeCS4Vof3G9uog8YcUxYBEGcAageGEUWdo5hBIhUe64epB6T 3ewVAFVv2hmO9gUsTVXPu8DH//WdzeixvpJJDczIu1liLLyxa4OpkukZLC7J7m7MS5oo XVs2qbfSXXLp8DaJYj8PQcr3d2ZgdjxhX9WX9jIDHv+yB7eh4fhD4J9MkR5e6ShxIGL7 FL7Ga9xSfHqczJzqeteiYXkNXw6BNnaortSmUvYwqe57PY6WuQ0WRvEOfiaJhjGKzdp+ D6E+Hgc1vBQ6dnWw0DNEk706+69/6842WJFsEk8ZzKWVQvENN/h2o+Aagi4fWoEySAJe /1Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LQV1RFpf; 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=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a23si11316463pfh.295.2018.04.24.23.27.42; Tue, 24 Apr 2018 23:27:43 -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=@linaro.org header.s=google header.b=LQV1RFpf; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751683AbeDYG1k (ORCPT + 29 others); Wed, 25 Apr 2018 02:27:40 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36294 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751538AbeDYG1f (ORCPT ); Wed, 25 Apr 2018 02:27:35 -0400 Received: by mail-pg0-f66.google.com with SMTP id i6so12609124pgv.3 for ; Tue, 24 Apr 2018 23:27:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jBK3ptBP+kuxlmMWHAiBOcRa6D76/Wey0R++OHp+zjo=; b=LQV1RFpfWihgSWvjd4LkN4ClTBNu1yJrc0cOx7pJpL2g03gGuBSjVdJa2MC4SsY89E 8k677THLK5jU6Ih9tCqDUQdfSix/BAAB4DgGRuDf473/VYmxOG2V2sPgUU8C/pw2jfMc T448EKBnTcFZ63X4iKxLX7n00RXTXo96Mvwwg= 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=jBK3ptBP+kuxlmMWHAiBOcRa6D76/Wey0R++OHp+zjo=; b=tKSVvBghJccJ4HuQP8m07FWWpGV5hYuZYc9kDTI6qwyU83bYnUIq+/+AtUcLCUSTSm 8tsFeq8WfLZ28C5WdmE0hVaSVNhJtmSChzP/2+HzySabqIJL1kYmiNqJ+P+W0JwjKug4 0f2qjJacfMWKYlKTLFh7v6IpTeT2u4U3DCBNNA0u5Lneg+667eOr2h2R6woroY6spsX7 eD1YBJlytScsHxF9YCI42qPK/6bMBrs4zNiOrZzdjzPGy1o0qRaEVr1quz0QaDG8fpNF UmbmBMu0RT9yEAZaEIC2YgVnMACaAn7oORiiKkRuMk7P2G3V1ZK5701dCcPBtWulfwED 5FTQ== X-Gm-Message-State: ALQs6tBTnF3w7kK9ng0N2r8ApzSU1jbjBQSQ5FmCM2AOfIuNznSp5RJc 8Li2JXaiutG5TZuhlB1yuTwWxg== X-Received: by 2002:a17:902:2924:: with SMTP id g33-v6mr25575162plb.26.1524637655330; Tue, 24 Apr 2018 23:27:35 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id v16sm8888380pfk.164.2018.04.24.23.27.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 23:27:34 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de Cc: ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [PATCH v9 11/11] arm64: kexec_file: add kaslr support Date: Wed, 25 Apr 2018 15:26:29 +0900 Message-Id: <20180425062629.29404-12-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425062629.29404-1-takahiro.akashi@linaro.org> References: <20180425062629.29404-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding "kalsr-seed" to dtb enables triggering kaslr, or kernel virtual address randomization, at secondary kernel boot. We always do this as it wll have no harm on kaslr-incapable kernel. We don't have any "switch" to turn off this feature directly, but still can suppress it by passing "nokaslr" as a kernel boot argument. Signed-off-by: AKASHI Takahiro Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/kernel/machine_kexec_file.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.17.0 diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index ec674f4d267c..762f9102899c 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -246,6 +247,12 @@ static int setup_dtb(struct kimage *image, goto out_err; } + /* add kaslr-seed */ + get_random_bytes(&value, sizeof(value)); + ret = fdt_setprop(buf, nodeoffset, "kaslr-seed", &value, sizeof(value)); + if (ret) + goto out_err; + /* trim a buffer */ fdt_pack(buf); *dtb_buf = buf;