summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrie <none@none>2008-04-10 13:40:01 -0700
committerrie <none@none>2008-04-10 13:40:01 -0700
commit76396fcc7c8d694e8cb7822a4aeda9cf2b30fb3a (patch)
tree63d011e65790411ce3c8f735c01d16a325da69a6
parent82714199c1609fb4cb7d0f524cc6a6436eea4d25 (diff)
downloadillumos-gate-76396fcc7c8d694e8cb7822a4aeda9cf2b30fb3a.tar.gz
6686889 ld.so.1 regression - bad pointer created with 6509323 integration
-rw-r--r--usr/src/cmd/sgs/packages/common/SUNWonld-README1
-rw-r--r--usr/src/cmd/sgs/rtld/common/elf.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/cmd/sgs/packages/common/SUNWonld-README b/usr/src/cmd/sgs/packages/common/SUNWonld-README
index 24acc63911..640b6becab 100644
--- a/usr/src/cmd/sgs/packages/common/SUNWonld-README
+++ b/usr/src/cmd/sgs/packages/common/SUNWonld-README
@@ -1336,3 +1336,4 @@ Bugid Risk Synopsis
6509323 Need to disable the Multiple Files loading - same name, different
directories (or its stat() use)
6685125 ld/elfdump do not handle ZERO terminator .eh_frame amd64 unwind entry
+6686889 ld.so.1 regression - bad pointer created with 6509323 integration
diff --git a/usr/src/cmd/sgs/rtld/common/elf.c b/usr/src/cmd/sgs/rtld/common/elf.c
index cf19a36c34..1ff5f5c9f2 100644
--- a/usr/src/cmd/sgs/rtld/common/elf.c
+++ b/usr/src/cmd/sgs/rtld/common/elf.c
@@ -1719,7 +1719,7 @@ _elf_lookup_filtee(Slookup *slp, Rt_map **dlmp, uint_t *binfo, uint_t ndx,
continue;
if (((sym = SYMINTP(sl.sl_imap)(&sl, dlmp,
- binfo)) != 0) ||
+ binfo, in_nfavl)) != 0) ||
(ghp->gh_flags & GPH_FIRST))
break;
}