Commit 558b9206 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-fixes-v7.0-rc7' of... 

Merge tag 'probes-fixes-v7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull tracing probe fix from Masami Hiramatsu:
 "Reject non-closed empty immediate strings

  Fix a buffer index underflow bug that occurred when passing an
  non-closed empty immediate string to the probe event"

* tag 'probes-fixes-v7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing/probe: reject non-closed empty immediate strings
parents 6b5199f4 4346be65

kernel/trace/trace_probe.c

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static int __parse_imm_string(char *str, char **pbuf, int offs) 
{

	size_t len = strlen(str);



	if (str[len - 1] != '"') {

	if (!len || str[len - 1] != '"') {

		trace_probe_log_err(offs + len, IMMSTR_NO_CLOSE);

		return -EINVAL;

	}