Commit 6bbfa441 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)

kprobes: Limit max data_size of the kretprobe instances

The 'kprobe::data_size' is unsigned, thus it can not be negative.  But if
user sets it enough big number (e.g. (size_t)-8), the result of 'data_size
+ sizeof(struct kretprobe_instance)' becomes smaller than sizeof(struct
kretprobe_instance) or zero. In result, the kretprobe_instance are
allocated without enough memory, and kretprobe accesses outside of
allocated memory.

To avoid this issue, introduce a max limitation of the
kretprobe::data_size. 4KB per instance should be OK.

Link: https://lkml.kernel.org/r/163836995040.432120.10322772773821182925.stgit@devnote2

Cc: stable@vger.kernel.org
Fixes: f47cd9b5 ("kprobes: kretprobe user entry-handler")
Reported-by: default avatarzhangyue <zhangyue1@kylinos.cn>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent f25667e5
...@@ -153,6 +153,8 @@ struct kretprobe { ...@@ -153,6 +153,8 @@ struct kretprobe {
struct kretprobe_holder *rph; struct kretprobe_holder *rph;
}; };
#define KRETPROBE_MAX_DATA_SIZE 4096
struct kretprobe_instance { struct kretprobe_instance {
union { union {
struct freelist_node freelist; struct freelist_node freelist;
......
...@@ -2086,6 +2086,9 @@ int register_kretprobe(struct kretprobe *rp) ...@@ -2086,6 +2086,9 @@ int register_kretprobe(struct kretprobe *rp)
} }
} }
if (rp->data_size > KRETPROBE_MAX_DATA_SIZE)
return -E2BIG;
rp->kp.pre_handler = pre_handler_kretprobe; rp->kp.pre_handler = pre_handler_kretprobe;
rp->kp.post_handler = NULL; rp->kp.post_handler = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment