kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

addr2line.c: boundary checks

Browse source 
* addr2line.c (parse_debug_line_cu): boundary checks for
  compressed debug sections.  [ruby-dev:49840] [Bug #12850]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-10-18 15:09:08 +00:00
parent a40d95c48f
commit 685a436a49
2 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Oct 19 00:09:06 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* addr2line.c (parse_debug_line_cu): boundary checks for
compressed debug sections. [ruby-dev:49840] [Bug #12850]
Tue Oct 18 16:36:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 18 16:36:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (DLDFLAGS): append --compress-debug-sections=zlib * configure.in (DLDFLAGS): append --compress-debug-sections=zlib

23
addr2line.c
View file

@ -225,7 +225,7 @@ fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
} }
} }
static void static int
parse_debug_line_cu(int num_traces, void **traces, char **debug_line, parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
obj_info_t *obj, line_info_t *lines, int offset) obj_info_t *obj, line_info_t *lines, int offset)
{ {
@ -287,9 +287,13 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
include_directories = p; include_directories = p;
/* temporary measure for compress-debug-sections */
if (p >= cu_end) return -1;
/* skip include directories */ /* skip include directories */
while (*p) { while (*p) {
while (*p) p++; p = memchr(p, '\0', cu_end - p);
if (!p) return -1;
p++; p++;
} }
p++; p++;
@ -397,21 +401,24 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
} }
} }
*debug_line = p; *debug_line = p;
return 0;
} }
static void static int
parse_debug_line(int num_traces, void **traces, parse_debug_line(int num_traces, void **traces,
char *debug_line, unsigned long size, char *debug_line, unsigned long size,
obj_info_t *obj, line_info_t *lines, int offset) obj_info_t *obj, line_info_t *lines, int offset)
{ {
char *debug_line_end = debug_line + size; char *debug_line_end = debug_line + size;
while (debug_line < debug_line_end) { while (debug_line < debug_line_end) {
parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset); if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset))
return -1;
} }
if (debug_line != debug_line_end) { if (debug_line != debug_line_end) {
kprintf("Unexpected size of .debug_line in %s\n", kprintf("Unexpected size of .debug_line in %s\n",
binary_filename); binary_filename);
} }
return 0;
} }
/* read file and fill lines */ /* read file and fill lines */
@ -620,10 +627,11 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
goto finish; goto finish;
} }
parse_debug_line(num_traces, traces, if (parse_debug_line(num_traces, traces,
file + debug_line_shdr->sh_offset, file + debug_line_shdr->sh_offset,
debug_line_shdr->sh_size, debug_line_shdr->sh_size,
obj, lines, offset); obj, lines, offset))
goto fail;
finish: finish:
return dladdr_fbase; return dladdr_fbase;
fail: fail:
@ -719,7 +727,8 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
obj->path = path; obj->path = path;
lines[i].path = path; lines[i].path = path;
strcpy(binary_filename, path); strcpy(binary_filename, path);
fill_lines(num_traces, traces, 1, &obj, lines, i); if (fill_lines(num_traces, traces, 1, &obj, lines, i) == (uintptr_t)-1)
break;
} }
next_line: next_line:
continue; continue;