kprobes: Support __kprobes blacklist in modules (1e6769b0) · Commits · 戴 / test

include/linux/module.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -489,6 +489,10 @@ struct module {
		unsigned int num_ftrace_callsites;
		unsigned long *ftrace_callsites;
		#endif
		#ifdef CONFIG_KPROBES
		void *kprobes_text_start;
		unsigned int kprobes_text_size;
		#endif

		#ifdef CONFIG_LIVEPATCH
		bool klp; /* Is this a livepatch module? */

kernel/kprobes.c

+42 −0

Original line number	Diff line number	Diff line
		@@ -2179,6 +2179,19 @@ int kprobe_add_area_blacklist(unsigned long start, unsigned long end)
		return 0;
		}

		/* Remove all symbols in given area from kprobe blacklist */
		static void kprobe_remove_area_blacklist(unsigned long start, unsigned long end)
		{
		struct kprobe_blacklist_entry ent, n;

		list_for_each_entry_safe(ent, n, &kprobe_blacklist, list) {
		if (ent->start_addr < start \|\| ent->start_addr >= end)
		continue;
		list_del(&ent->list);
		kfree(ent);
		}
		}

		int __init __weak arch_populate_kprobe_blacklist(void)
		{
		return 0;
		@@ -2215,6 +2228,28 @@ static int __init populate_kprobe_blacklist(unsigned long *start,
		return ret ? : arch_populate_kprobe_blacklist();
		}

		static void add_module_kprobe_blacklist(struct module *mod)
		{
		unsigned long start, end;

		start = (unsigned long)mod->kprobes_text_start;
		if (start) {
		end = start + mod->kprobes_text_size;
		kprobe_add_area_blacklist(start, end);
		}
		}

		static void remove_module_kprobe_blacklist(struct module *mod)
		{
		unsigned long start, end;

		start = (unsigned long)mod->kprobes_text_start;
		if (start) {
		end = start + mod->kprobes_text_size;
		kprobe_remove_area_blacklist(start, end);
		}
		}

		/* Module notifier call back, checking kprobes on the module */
		static int kprobes_module_callback(struct notifier_block *nb,
		unsigned long val, void *data)
		@@ -2225,6 +2260,11 @@ static int kprobes_module_callback(struct notifier_block *nb,
		unsigned int i;
		int checkcore = (val == MODULE_STATE_GOING);

		if (val == MODULE_STATE_COMING) {
		mutex_lock(&kprobe_mutex);
		add_module_kprobe_blacklist(mod);
		mutex_unlock(&kprobe_mutex);
		}
		if (val != MODULE_STATE_GOING && val != MODULE_STATE_LIVE)
		return NOTIFY_DONE;

		@@ -2255,6 +2295,8 @@ static int kprobes_module_callback(struct notifier_block *nb,
		kill_kprobe(p);
		}
		}
		if (val == MODULE_STATE_GOING)
		remove_module_kprobe_blacklist(mod);
		mutex_unlock(&kprobe_mutex);
		return NOTIFY_DONE;
		}

kernel/module.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -3193,6 +3193,10 @@ static int find_module_sections(struct module mod, struct load_info info)
		mod->ei_funcs = section_objs(info, "_error_injection_whitelist",
		sizeof(*mod->ei_funcs),
		&mod->num_ei_funcs);
		#endif
		#ifdef CONFIG_KPROBES
		mod->kprobes_text_start = section_objs(info, ".kprobes.text", 1,
		&mod->kprobes_text_size);
		#endif
		mod->extable = section_objs(info, "__ex_table",
		sizeof(*mod->extable), &mod->num_exentries);

Admin message