summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-01-21 19:20:35 +0200
committerToomas Soome <tsoome@me.com>2019-06-24 21:19:46 +0300
commit22ca2f96318fd461cfbcc23fd450623fe08610a3 (patch)
treed74e3b7f41ef5d7352a2b31a4f4b49a98774415c
parent6888a8ba15f151decee7821a09e34fed2fb63513 (diff)
downloadillumos-joyent-22ca2f96318fd461cfbcc23fd450623fe08610a3.tar.gz
11109 librtld_db: NULL pointer errors
Reviewed by: Jason Lippert <jason@glasspelican.ca> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/cmd/sgs/librtld_db/common/rd_elf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/cmd/sgs/librtld_db/common/rd_elf.c b/usr/src/cmd/sgs/librtld_db/common/rd_elf.c
index 410b819b30..737fb2ee0f 100644
--- a/usr/src/cmd/sgs/librtld_db/common/rd_elf.c
+++ b/usr/src/cmd/sgs/librtld_db/common/rd_elf.c
@@ -140,7 +140,7 @@ validate_rdebug32(struct rd_agent *rap)
rd_err_e
find_dynamic_ent32(struct rd_agent *rap, psaddr_t dynaddr,
- Xword dyntag, Dyn *dyn)
+ Xword dyntag, Dyn *dyn)
{
struct ps_prochandle *php = rap->rd_psp;
Dyn d;
@@ -550,7 +550,7 @@ _rd_objpad_enable32(struct rd_agent *rap, size_t padsize)
static rd_err_e
iter_map(rd_agent_t *rap, unsigned long ident, psaddr_t lmaddr,
- rl_iter_f *cb, void *client_data, uint_t *abort_iterp)
+ rl_iter_f *cb, void *client_data, uint_t *abort_iterp)
{
while (lmaddr) {
Rt_map rmap;
@@ -704,7 +704,7 @@ _rd_loadobj_iter32_native(rd_agent_t *rap, rl_iter_f *cb, void *client_data,
return (RD_DBERR);
}
- if (db_priv.rtd_dynlmlst == NULL) {
+ if (db_priv.rtd_dynlmlst == 0) {
LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT),
EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst)));
return (RD_NOMAPS);
@@ -717,7 +717,7 @@ _rd_loadobj_iter32_native(rd_agent_t *rap, rl_iter_f *cb, void *client_data,
return (RD_DBERR);
}
- if (addr == NULL) {
+ if (addr == 0) {
LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT_1),
EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst)));
return (RD_NOMAPS);