From: Kees Cook <keescook@chromium.org> To: linux-kernel@vger.kernel.org Cc: Kees Cook <keescook@chromium.org>, Doug Anderson <dianders@chromium.org>, Liu hua <sdu.liu@huawei.com>, Mark Salter <msalter@redhat.com>, Rabin Vincent <rabin@rab.in>, Nikolay Borisov <Nikolay.Borisov@arm.com>, 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>, Jason Wessel <jason.wessel@windriver.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 6/8] arm: kgdb: Handle read-only text / modules Date: Thu, 7 Aug 2014 08:01:51 -0700 [thread overview] Message-ID: <1407423713-4160-7-git-send-email-keescook@chromium.org> (raw) In-Reply-To: <1407423713-4160-1-git-send-email-keescook@chromium.org> From: Doug Anderson <dianders@chromium.org> Handle the case where someone has set the text segment of the kernel as read-only by using the newly introduced "patch" mechanism. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/kgdb.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 38ddd9f83d0e..70b730766330 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -67,7 +67,7 @@ test-kprobes-objs += kprobes-test-arm.o endif obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o obj-$(CONFIG_ARM_THUMBEE) += thumbee.o -obj-$(CONFIG_KGDB) += kgdb.o +obj-$(CONFIG_KGDB) += kgdb.o patch.o obj-$(CONFIG_ARM_UNWIND) += unwind.o obj-$(CONFIG_HAVE_TCM) += tcm.o obj-$(CONFIG_OF) += devtree.o diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c index a74b53c1b7df..b2b9ccb6be59 100644 --- a/arch/arm/kernel/kgdb.c +++ b/arch/arm/kernel/kgdb.c @@ -12,8 +12,12 @@ #include <linux/irq.h> #include <linux/kdebug.h> #include <linux/kgdb.h> +#include <linux/uaccess.h> + #include <asm/traps.h> +#include "patch.h" + struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { { "r0", 4, offsetof(struct pt_regs, ARM_r0)}, @@ -244,6 +248,32 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } +int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) +{ + int err; + + /* patch_text() only supports int-sized breakpoints */ + if (sizeof(int) != BREAK_INSTR_SIZE) + return -EINVAL; + + err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr, + BREAK_INSTR_SIZE); + if (err) + return err; + + patch_text((void *)bpt->bpt_addr, + *(unsigned int *)arch_kgdb_ops.gdb_bpt_instr); + + return err; +} + +int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) +{ + patch_text((void *)bpt->bpt_addr, *(unsigned int *)bpt->saved_instr); + + return 0; +} + /* * Register our undef instruction hooks with ARM undef core. * We regsiter a hook specifically looking for the KGB break inst -- 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 6/8] arm: kgdb: Handle read-only text / modules Date: Thu, 7 Aug 2014 08:01:51 -0700 [thread overview] Message-ID: <1407423713-4160-7-git-send-email-keescook@chromium.org> (raw) In-Reply-To: <1407423713-4160-1-git-send-email-keescook@chromium.org> From: Doug Anderson <dianders@chromium.org> Handle the case where someone has set the text segment of the kernel as read-only by using the newly introduced "patch" mechanism. Signed-off-by: Doug Anderson <dianders@chromium.org> Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/kgdb.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 38ddd9f83d0e..70b730766330 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -67,7 +67,7 @@ test-kprobes-objs += kprobes-test-arm.o endif obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o obj-$(CONFIG_ARM_THUMBEE) += thumbee.o -obj-$(CONFIG_KGDB) += kgdb.o +obj-$(CONFIG_KGDB) += kgdb.o patch.o obj-$(CONFIG_ARM_UNWIND) += unwind.o obj-$(CONFIG_HAVE_TCM) += tcm.o obj-$(CONFIG_OF) += devtree.o diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c index a74b53c1b7df..b2b9ccb6be59 100644 --- a/arch/arm/kernel/kgdb.c +++ b/arch/arm/kernel/kgdb.c @@ -12,8 +12,12 @@ #include <linux/irq.h> #include <linux/kdebug.h> #include <linux/kgdb.h> +#include <linux/uaccess.h> + #include <asm/traps.h> +#include "patch.h" + struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { { "r0", 4, offsetof(struct pt_regs, ARM_r0)}, @@ -244,6 +248,32 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } +int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) +{ + int err; + + /* patch_text() only supports int-sized breakpoints */ + if (sizeof(int) != BREAK_INSTR_SIZE) + return -EINVAL; + + err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr, + BREAK_INSTR_SIZE); + if (err) + return err; + + patch_text((void *)bpt->bpt_addr, + *(unsigned int *)arch_kgdb_ops.gdb_bpt_instr); + + return err; +} + +int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) +{ + patch_text((void *)bpt->bpt_addr, *(unsigned int *)bpt->saved_instr); + + return 0; +} + /* * Register our undef instruction hooks with ARM undef core. * We regsiter a hook specifically looking for the KGB break inst -- 1.9.1
next prev parent reply other threads:[~2014-08-07 15:03 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-08-07 15:01 [PATCH v2 0/8] arm: support CONFIG_RODATA Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-07 15:01 ` [PATCH 1/8] arm: use generic fixmap.h Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-07 17:38 ` Leif Lindholm 2014-08-07 17:38 ` Leif Lindholm 2014-08-07 17:47 ` Kees Cook 2014-08-07 17:47 ` Kees Cook 2014-08-07 15:01 ` [PATCH 2/8] arm: fixmap: implement __set_fixmap() Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-07 15:01 ` [PATCH 3/8] arm: mm: reduce fixmap kmap from 32 to 16 CPUS Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-07 22:18 ` Rob Herring 2014-08-07 22:18 ` Rob Herring 2014-08-08 10:16 ` Leif Lindholm 2014-08-08 10:16 ` Leif Lindholm 2014-08-09 0:11 ` Kees Cook 2014-08-09 0:11 ` Kees Cook 2014-08-07 15:01 ` [PATCH 4/8] arm: use fixmap for text patching when text is RO Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-07 15:01 ` [PATCH 5/8] ARM: kexec: Make .text R/W in machine_kexec Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-07 15:01 ` Kees Cook [this message] 2014-08-07 15:01 ` [PATCH 6/8] arm: kgdb: Handle read-only text / modules Kees Cook 2014-08-07 15:01 ` [PATCH 7/8] ARM: mm: allow non-text sections to be non-executable Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-07 15:01 ` [PATCH 8/8] ARM: mm: allow text and rodata sections to be read-only Kees Cook 2014-08-07 15:01 ` Kees Cook 2014-08-11 13:30 ` Will Deacon 2014-08-11 13:30 ` Will Deacon 2014-08-11 15:41 ` Kees Cook 2014-08-11 15:41 ` Kees Cook 2014-08-07 20:43 ` [PATCH v2 0/8] arm: support CONFIG_RODATA Laura Abbott 2014-08-07 20:43 ` Laura Abbott
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=1407423713-4160-7-git-send-email-keescook@chromium.org \ --to=keescook@chromium.org \ --cc=Nikolay.Borisov@arm.com \ --cc=catalin.marinas@arm.com \ --cc=dianders@chromium.org \ --cc=dianders@google.com \ --cc=jason.wessel@windriver.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.