x86: fix typo in comment for poke_text_early
PATCH 1/3 x86: fix typo in comment for poke_text_early
In the documentation for text_poke_early, "protected again" should actually be "protected against". This patch fixes the spelling mistake.
--- arch/x86/include/asm/text-patching.h | 4 ++-- arch/x86/kernel/alternative.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/include/asm/text-patching.h +2 -2
@@ -45,8 +45,8 @@ extern void text_poke_early(void *addr, const void *opcode, size_t len);* no thread can be preempted in the instructions being modified (no iret to an * invalid instruction possible) or if the instructions are changed from a * consistent state to another consistent state atomically. -* On the local CPU you need to be protected again NMI or MCE handlers seeing an -* inconsistent instruction while you patch. +* On the local CPU you need to be protected against NMI or MCE handlers seeing +* an inconsistent instruction while you patch. */ extern void *text_poke (void *addr,const void *opcode,size_t len);extern void *text_poke_kgdb (void *addr,const void *opcode,size_t len);
arch/x86/kernel/alternative.c +2 -2
@@ -753,8 +753,8 @@ void __init alternative_instructions(void)* When you use this code to patch more than one byte of an instruction * you need to make sure that other CPUs cannot execute this code in parallel. * Also no thread must be currently preempted in the middle of these -* instructions. And on the local CPU you need to be protected again NMI or MCE -* handlers seeing an inconsistent instruction while you patch. +* instructions. And on the local CPU you need to be protected against NMI or +* MCE handlers seeing an inconsistent instruction while you patch. */ void __init_or_module text_poke_early(void *addr, const void *opcode,size_t len)
Signature · 1 line
2.23.0
PATCH 2/3 x86: fix typo in comment for alternative_instructions
In the documentation for alternative_instructions, "a unlikely" should actually be "an unlikely". This patch fixes the mistake.
--- arch/x86/kernel/alternative.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/alternative.c +1 -1
@@ -713,7 +713,7 @@ void __init alternative_instructions(void)* Don't stop machine check exceptions while patching. * MCEs only happen when something got corrupted and in this * case we must do something about the corruption. -* Ignoring it is worse than a unlikely patching race. +* Ignoring it is worse than an unlikely patching race. * Also machine checks tend to be broadcast and if one CPU * goes into machine check the others follow quickly, so we don't * expect a machine check to cause undue problems during to code
Signature · 1 line
2.23.0
PATCH 3/3 x86: kprobes: fix typo in comment
In reply to Marco AmmonIn the comment for arch_prepare_optimized_kprobe, "instuction" should actually be "instruction". This patch fixes the typo.
--- arch/x86/kernel/kprobes/opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/kprobes/opt.c +1 -1
@@ -403,7 +403,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, (u8 *)op->kp.addr + op->optinsn.size); len +=RELATIVEJUMP_SIZE ; -/* We have to use text_poke for instuction buffer because it is RO */ +/* We have to use text_poke for instruction buffer because it is RO */ text_poke (slot, buf, len); ret =0 ; out:
Signature · 1 line
2.23.0
Borislav Petkov
maintainerQuoted 2 lines · Marco Ammon
In the documentation for
text_poke_early, "protected again" should actually be "protected against". This patch fixes the spelling mistake.
For the future:
Avoid having "This patch" or "This commit" in the commit message. It is tautologically useless.
Also, do
$ git grep 'This patch' Documentation/process
for more details.
I've merged those patches into a single one and have applied it.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.[tip: x86/cleanups] x86: Correct misc typos
In reply to Marco AmmonThe following commit has been merged into the x86/cleanups branch of tip:
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 32b1cbe380417f2ed80f758791179de6b05795ab Gitweb: https://git.kernel.org/tip/32b1cbe380417f2ed80f758791179de6b05795ab Author: Marco Ammon <[email protected]> AuthorDate: Mon, 02 Sep 2019 14:02:59 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Mon, 02 Sep 2019 14:02:59 +02:00
x86: Correct misc typos
Correct spelling typos in comments in different files under arch/x86/.
[ bp: Merge into a single patch, massage. ]
--- arch/x86/include/asm/text-patching.h | 4 ++-- arch/x86/kernel/alternative.c | 6 +++--- arch/x86/kernel/kprobes/opt.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/include/asm/text-patching.h +2 -2
@@ -45,8 +45,8 @@ extern void text_poke_early(void *addr, const void *opcode, size_t len);* no thread can be preempted in the instructions being modified (no iret to an * invalid instruction possible) or if the instructions are changed from a * consistent state to another consistent state atomically. -* On the local CPU you need to be protected again NMI or MCE handlers seeing an -* inconsistent instruction while you patch. +* On the local CPU you need to be protected against NMI or MCE handlers seeing +* an inconsistent instruction while you patch. */ extern void *text_poke (void *addr,const void *opcode,size_t len);extern void *text_poke_kgdb (void *addr,const void *opcode,size_t len);
arch/x86/kernel/alternative.c +3 -3
@@ -713,7 +713,7 @@ void __init alternative_instructions(void)* Don't stop machine check exceptions while patching. * MCEs only happen when something got corrupted and in this * case we must do something about the corruption. -* Ignoring it is worse than a unlikely patching race. +* Ignoring it is worse than an unlikely patching race. * Also machine checks tend to be broadcast and if one CPU * goes into machine check the others follow quickly, so we don't * expect a machine check to cause undue problems during to code
@@ -753,8 +753,8 @@ void __init alternative_instructions(void)* When you use this code to patch more than one byte of an instruction * you need to make sure that other CPUs cannot execute this code in parallel. * Also no thread must be currently preempted in the middle of these -* instructions. And on the local CPU you need to be protected again NMI or MCE -* handlers seeing an inconsistent instruction while you patch. +* instructions. And on the local CPU you need to be protected against NMI or +* MCE handlers seeing an inconsistent instruction while you patch. */ void __init_or_module text_poke_early(void *addr, const void *opcode,size_t len)
arch/x86/kernel/kprobes/opt.c +1 -1
@@ -403,7 +403,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, (u8 *)op->kp.addr + op->optinsn.size); len +=RELATIVEJUMP_SIZE ; -/* We have to use text_poke for instuction buffer because it is RO */ +/* We have to use text_poke() for instruction buffer because it is RO */ text_poke (slot, buf, len); ret =0 ; out: