From: Kees Cook <keescook@chromium.org> To: linux-kernel@vger.kernel.org Cc: Kees Cook <keescook@chromium.org>, Nikolay Borisov <Nikolay.Borisov@arm.com>, Liu hua <sdu.liu@huawei.com>, Mark Salter <msalter@redhat.com>, Rabin Vincent <rabin@rab.in>, Nicolas Pitre <nicolas.pitre@linaro.org>, Leif Lindholm <leif.lindholm@linaro.org>, Tomasz Figa <t.figa@samsung.com>, Rob Herring <robh@kernel.org>, Doug Anderson <dianders@google.com>, Will Deacon <will.deacon@arm.com>, Laura Abbott <lauraa@codeaurora.org>, Catalin Marinas <catalin.marinas@arm.com>, Russell King - ARM Linux <linux@arm.linux.org.uk>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/7] ARM: kexec: Make .text R/W in machine_kexec Date: Wed, 6 Aug 2014 12:32:42 -0700 [thread overview] Message-ID: <1407353564-21478-6-git-send-email-keescook@chromium.org> (raw) In-Reply-To: <1407353564-21478-1-git-send-email-keescook@chromium.org> From: Nikolay Borisov <Nikolay.Borisov@arm.com> With the introduction of Kees Cook's patch to make the kernel .text read-only the existing method by which kexec works got broken since it directly pokes some values in the template code, which resides in the .text section. The current patch changes the way those values are inserted so that poking .text section occurs only in machine_kexec (e.g when we are about to nuke the old kernel and are beyond the point of return). This allows to use set_kernel_text_rw() to directly patch the values in the .text section. I had already sent a patch which achieved this but it was significantly more complicated, so this is a cleaner/straight-forward approach. Signed-off-by: Nikolay Borisov <Nikolay.Borisov@arm.com> Acked-by: Will Deacon <will.deacon@arm.com> [collapsed kexec_boot_atags (will.daecon)] Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/arm/kernel/machine_kexec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index 8cf0996aa1a8..fe6f3860ea57 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c @@ -29,6 +29,7 @@ extern unsigned long kexec_boot_atags; static atomic_t waiting_for_crash_ipi; +static unsigned long dt_mem; /* * Provide a dummy crash_notes definition while crash dump arrives to arm. * This prevents breakage of crash_notes attribute in kernel/ksysfs.c. @@ -64,7 +65,7 @@ int machine_kexec_prepare(struct kimage *image) return err; if (be32_to_cpu(header) == OF_DT_HEADER) - kexec_boot_atags = current_segment->mem; + dt_mem = current_segment->mem; } return 0; } @@ -163,12 +164,13 @@ void machine_kexec(struct kimage *image) reboot_code_buffer = page_address(image->control_code_page); /* Prepare parameters for reboot_code_buffer*/ + set_kernel_text_rw(); kexec_start_address = image->start; kexec_indirection_page = page_list; kexec_mach_type = machine_arch_type; - if (!kexec_boot_atags) - kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET; - + kexec_boot_atags = dt_mem ?: kexec_boot_atags = image->start + - KEXEC_ARM_ZIMAGE_OFFSET + + KEXEC_ARM_ATAGS_OFFSET; /* copy our kernel relocation code to the control code page */ reboot_entry = fncpy(reboot_code_buffer, -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: keescook@chromium.org (Kees Cook) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/7] ARM: kexec: Make .text R/W in machine_kexec Date: Wed, 6 Aug 2014 12:32:42 -0700 [thread overview] Message-ID: <1407353564-21478-6-git-send-email-keescook@chromium.org> (raw) In-Reply-To: <1407353564-21478-1-git-send-email-keescook@chromium.org> From: Nikolay Borisov <Nikolay.Borisov@arm.com> With the introduction of Kees Cook's patch to make the kernel .text read-only the existing method by which kexec works got broken since it directly pokes some values in the template code, which resides in the .text section. The current patch changes the way those values are inserted so that poking .text section occurs only in machine_kexec (e.g when we are about to nuke the old kernel and are beyond the point of return). This allows to use set_kernel_text_rw() to directly patch the values in the .text section. I had already sent a patch which achieved this but it was significantly more complicated, so this is a cleaner/straight-forward approach. Signed-off-by: Nikolay Borisov <Nikolay.Borisov@arm.com> Acked-by: Will Deacon <will.deacon@arm.com> [collapsed kexec_boot_atags (will.daecon)] Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/arm/kernel/machine_kexec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index 8cf0996aa1a8..fe6f3860ea57 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c @@ -29,6 +29,7 @@ extern unsigned long kexec_boot_atags; static atomic_t waiting_for_crash_ipi; +static unsigned long dt_mem; /* * Provide a dummy crash_notes definition while crash dump arrives to arm. * This prevents breakage of crash_notes attribute in kernel/ksysfs.c. @@ -64,7 +65,7 @@ int machine_kexec_prepare(struct kimage *image) return err; if (be32_to_cpu(header) == OF_DT_HEADER) - kexec_boot_atags = current_segment->mem; + dt_mem = current_segment->mem; } return 0; } @@ -163,12 +164,13 @@ void machine_kexec(struct kimage *image) reboot_code_buffer = page_address(image->control_code_page); /* Prepare parameters for reboot_code_buffer*/ + set_kernel_text_rw(); kexec_start_address = image->start; kexec_indirection_page = page_list; kexec_mach_type = machine_arch_type; - if (!kexec_boot_atags) - kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET; - + kexec_boot_atags = dt_mem ?: kexec_boot_atags = image->start + - KEXEC_ARM_ZIMAGE_OFFSET + + KEXEC_ARM_ATAGS_OFFSET; /* copy our kernel relocation code to the control code page */ reboot_entry = fncpy(reboot_code_buffer, -- 1.9.1
next prev parent reply other threads:[~2014-08-06 19:35 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-06 19:32 [PATCH 0/7] arm: support CONFIG_RODATA Kees Cook 2014-08-06 19:32 ` Kees Cook 2014-08-06 19:32 ` [PATCH 1/7] arm: use generic fixmap.h Kees Cook 2014-08-06 19:32 ` Kees Cook 2014-08-07 2:24 ` Laura Abbott 2014-08-07 2:24 ` Laura Abbott 2014-08-07 14:35 ` Kees Cook 2014-08-07 14:35 ` Kees Cook 2014-08-07 15:15 ` Max Filippov 2014-08-07 15:15 ` Max Filippov 2014-08-07 15:22 ` Rob Herring 2014-08-07 15:22 ` Rob Herring 2014-08-07 15:32 ` Nicolas Pitre 2014-08-07 15:32 ` Nicolas Pitre 2014-08-07 15:42 ` Max Filippov 2014-08-07 15:42 ` Max Filippov 2014-08-07 17:23 ` Mark Salter 2014-08-07 17:23 ` Mark Salter 2014-08-06 19:32 ` [PATCH 2/7] arm: fixmap: implement __set_fixmap() Kees Cook 2014-08-06 19:32 ` Kees Cook 2014-08-06 19:32 ` [PATCH 3/7] arm: mm: reduce fixmap kmap from 32 to 16 CPUS Kees Cook 2014-08-06 19:32 ` Kees Cook 2014-08-06 19:32 ` [PATCH 4/7] arm: use fixmap for text patching when text is RO Kees Cook 2014-08-06 19:32 ` Kees Cook 2014-08-06 19:32 ` Kees Cook [this message] 2014-08-06 19:32 ` [PATCH 5/7] ARM: kexec: Make .text R/W in machine_kexec Kees Cook 2014-08-06 19:32 ` [PATCH 6/7] ARM: mm: allow non-text sections to be non-executable Kees Cook 2014-08-06 19:32 ` Kees Cook 2014-08-06 19:32 ` [PATCH 7/7] ARM: mm: allow text and rodata sections to be read-only Kees Cook 2014-08-06 19:32 ` Kees Cook
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1407353564-21478-6-git-send-email-keescook@chromium.org \ --to=keescook@chromium.org \ --cc=Nikolay.Borisov@arm.com \ --cc=catalin.marinas@arm.com \ --cc=dianders@google.com \ --cc=lauraa@codeaurora.org \ --cc=leif.lindholm@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=msalter@redhat.com \ --cc=nicolas.pitre@linaro.org \ --cc=rabin@rab.in \ --cc=robh@kernel.org \ --cc=sdu.liu@huawei.com \ --cc=t.figa@samsung.com \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.