lkml.org 
[lkml]   [2015]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 2/2] perf probe: Add failure check when show variable range
Date
Change improper type size_t to diffptr_t to make consistent with libdw
and handle error code.

Signed-off-by: He Kuang <hekuang@huawei.com>
---
tools/perf/util/dwarf-aux.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
index 2cb4c82..7658fb4 100644
--- a/tools/perf/util/dwarf-aux.c
+++ b/tools/perf/util/dwarf-aux.c
@@ -965,7 +965,7 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die,
{
Dwarf_Die *scopes;
int count;
- size_t offset = 0;
+ ptrdiff_t offset = 0;
Dwarf_Addr base;
Dwarf_Addr start, end;
Dwarf_Addr entry;
@@ -991,6 +991,7 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die,

while ((offset = dwarf_ranges(&scopes[1], offset, &base,
&start, &end)) > 0) {
+
start -= entry;
end -= entry;

@@ -1004,6 +1005,11 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die,
}
}

+ if (offset < 0) {
+ ret = -EINVAL;
+ goto out;
+ }
+
if (!first)
strbuf_addf(buf, "]>");

@@ -1029,7 +1035,7 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf)
Dwarf_Addr entry;
Dwarf_Op *op;
size_t nops;
- size_t offset = 0;
+ ptrdiff_t offset = 0;
Dwarf_Attribute attr;
bool first = true;
const char *name;
@@ -1067,6 +1073,9 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf)
}
}

+ if (offset < 0)
+ return -EINVAL;
+
if (!first)
strbuf_addf(buf, "]>");

--
1.8.5.2


\
 
 \ /
  Last update: 2015-07-01 14:01    [W:0.049 / U:0.152 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site