imrcpan/freebsd
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-10-28 11:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

MFC r361844:

Browse Source 
librtld_db: Handle anonymous mappings below the first file mapping.
This commit is contained in:
Mark Johnston committed 2020-06-08 13:27:45 +00:00
1 parent d701b15f1f
commit f869fa91ff
1 file changed
+11 -6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/12/; revision=361927
Download Patch File Download Diff File Expand all files Collapse all files
lib/librtld_db/rtld_db.c
+11 -6
View File
@@ -186,11 +186,15 @@ rd_loadobj_iter(rd_agent_t *rdap, rl_iter_f *cb, void *clnt_data)
* file, but we want the mapping offset relative to the base
* mapping.
*/
if (kve->kve_type == KVME_TYPE_VNODE &&
kve->kve_vn_fileid != fileid) {
base = kve->kve_start;
fileid = kve->kve_vn_fileid;
path = kve->kve_path;
if (kve->kve_type == KVME_TYPE_VNODE) {
if (kve->kve_vn_fileid != fileid) {
base = kve->kve_start;
fileid = kve->kve_vn_fileid;
path = kve->kve_path;
}
} else {
base = 0;
path = NULL;
}
memset(&rdl, 0, sizeof(rdl));
/*
@@ -205,7 +209,8 @@ rd_loadobj_iter(rd_agent_t *rdap, rl_iter_f *cb, void *clnt_data)
rdl.rdl_prot |= RD_RDL_W;
if (kve->kve_protection & KVME_PROT_EXEC)
rdl.rdl_prot |= RD_RDL_X;
strlcpy(rdl.rdl_path, path, sizeof(rdl.rdl_path));
if (path != NULL)
strlcpy(rdl.rdl_path, path, sizeof(rdl.rdl_path));
if ((*cb)(&rdl, clnt_data) != 0) {
ret = RD_ERR;
break;