diff options
| author | dchagin <dchagin@FreeBSD.org> | 2016-01-09 15:53:50 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2016-01-09 15:53:50 +0000 |
| commit | d394e9fe7ed4dcb606783b6e55d8a92bef0cd1b9 (patch) | |
| tree | 0888bd1f1cfc0e28431cb71ca2ccb97cbb02c99b | |
| parent | 62726e37ba923515e74d7e361fdf5f17a26872b4 (diff) | |
| download | FreeBSD-src-d394e9fe7ed4dcb606783b6e55d8a92bef0cd1b9.zip FreeBSD-src-d394e9fe7ed4dcb606783b6e55d8a92bef0cd1b9.tar.gz | |
MFC r283414:
Print out proper procmap entry for 64 bit binaries.
| -rw-r--r-- | sys/compat/linprocfs/linprocfs.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 4aae77e..76760a1 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -965,6 +965,9 @@ linprocfs_doprocenviron(PFS_FILL_ARGS) return (ret); } +static char l32_map_str[] = "%08lx-%08lx %s%s%s%s %08lx %02x:%02x %lu%s%s\n"; +static char l64_map_str[] = "%016lx-%016lx %s%s%s%s %08lx %02x:%02x %lu%s%s\n"; + /* * Filler function for proc/pid/maps */ @@ -980,6 +983,7 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) vm_prot_t e_prot; unsigned int last_timestamp; char *name = "", *freename = NULL; + const char *l_map_str; ino_t ino; int ref_count, shadow_count, flags; int error; @@ -1048,8 +1052,11 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) * format: * start, end, access, offset, major, minor, inode, name. */ - error = sbuf_printf(sb, - "%08lx-%08lx %s%s%s%s %08lx %02x:%02x %lu%s%s\n", + if (SV_CURPROC_FLAG(SV_LP64)) + l_map_str = l64_map_str; + else + l_map_str = l32_map_str; + error = sbuf_printf(sb, l_map_str, (u_long)e_start, (u_long)e_end, (e_prot & VM_PROT_READ)?"r":"-", (e_prot & VM_PROT_WRITE)?"w":"-", |
