Message ID | 20140717071121.3130.86341.stgit@kbuild-fedora.novalocal (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
* Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> wrote: > Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> Looks good, but this is not a valid SOB sequence: if Suzuki wrote the patch then he should be the first SOB (and should have a From line as well), if he acked it along the way then it should be an Acked-by - or Reviewed-by. This fix should be in v3.16 as well, right? Thanks, Ingo
(2014/07/17 18:38), Ingo Molnar wrote: > > * Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> wrote: > >> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> >> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> > > Looks good, but this is not a valid SOB sequence: if Suzuki wrote the > patch then he should be the first SOB (and should have a From line as > well), if he acked it along the way then it should be an Acked-by - or > Reviewed-by. Ah, OK, so I'll add his name as Fixed-by:. > > This fix should be in v3.16 as well, right? Right, it should be. Thank you,
(2014/07/17 20:17), Masami Hiramatsu wrote: > (2014/07/17 18:38), Ingo Molnar wrote: >> >> * Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> wrote: >> >>> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> >>> Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> >> >> Looks good, but this is not a valid SOB sequence: if Suzuki wrote the >> patch then he should be the first SOB (and should have a From line as >> well), if he acked it along the way then it should be an Acked-by - or >> Reviewed-by. > > Ah, OK, so I'll add his name as Fixed-by:. Oops, I also found that an old comment in the patch description and unneeded "include". I'll fix and send that asap. Thank you,
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 3214289..ec370cc 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -32,6 +32,7 @@ * <prasanna@in.ibm.com> added function-return probes. */ #include <linux/kprobes.h> +#include <linux/types.h> #include <linux/hash.h> #include <linux/init.h> #include <linux/slab.h> @@ -2037,19 +2038,23 @@ static int __init populate_kprobe_blacklist(unsigned long *start, { unsigned long *iter; struct kprobe_blacklist_entry *ent; - unsigned long offset = 0, size = 0; + unsigned long entry, offset = 0, size = 0; for (iter = start; iter < end; iter++) { - if (!kallsyms_lookup_size_offset(*iter, &size, &offset)) { - pr_err("Failed to find blacklist %p\n", (void *)*iter); + entry = arch_deref_entry_point((void *)*iter); + + if (!kernel_text_address(entry) || + !kallsyms_lookup_size_offset(entry, &size, &offset)) { + pr_err("Failed to find blacklist at %p\n", + (void *)entry); continue; } ent = kmalloc(sizeof(*ent), GFP_KERNEL); if (!ent) return -ENOMEM; - ent->start_addr = *iter; - ent->end_addr = *iter + size; + ent->start_addr = entry; + ent->end_addr = entry + size; INIT_LIST_HEAD(&ent->list); list_add_tail(&ent->list, &kprobe_blacklist); }