Index: proc_sym.c
===================================================================
--- proc_sym.c	(revision 257599)
+++ proc_sym.c	(working copy)
@@ -263,7 +263,7 @@
 		 * by rtld.
 		 */
 		rsym = map->pr_vaddr + sym.st_value;
-		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
+		if (addr >= rsym && addr < (rsym + sym.st_size)) {
 			s = elf_strptr(e, dynsymstridx, sym.st_name);
 			if (s) {
 				strlcpy(name, s, namesz);
@@ -299,7 +299,7 @@
 			rsym = map->pr_vaddr + sym.st_value;
 		else
 			rsym = sym.st_value;
-		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
+		if (addr >= rsym && addr < (rsym + sym.st_size)) {
 			s = elf_strptr(e, symtabstridx, sym.st_name);
 			if (s) {
 				strlcpy(name, s, namesz);
@@ -439,7 +439,8 @@
 		s = elf_strptr(e, dynsymstridx, sym.st_name);
 		if (s && strcmp(s, symbol) == 0) {
 			memcpy(symcopy, &sym, sizeof(sym));
-			symcopy->st_value = map->pr_vaddr + sym.st_value;
+			if (ehdr.e_type != ET_EXEC)
+				symcopy->st_value += map->pr_vaddr;
 			error = 0;
 			goto out;
 		}
@@ -484,6 +485,7 @@
 	prmap_t *map;
 	Elf_Scn *scn, *foundscn = NULL;
 	Elf_Data *data;
+	GElf_Ehdr ehdr;
 	GElf_Shdr shdr;
 	GElf_Sym sym;
 	unsigned long stridx = -1;
@@ -500,6 +502,10 @@
 		warn("ERROR: elf_begin() failed");
 		goto err1;
 	}
+	if (gelf_getehdr(e, &ehdr) == NULL) {
+		warn("ERROR: gelf_getehdr() failed");
+		goto err2;
+	}
 	/*
 	 * Find the section we are looking for.
 	 */
@@ -550,7 +556,8 @@
 		    (mask & TYPE_FILE) == 0)
 			continue;
 		s = elf_strptr(e, stridx, sym.st_name);
-		sym.st_value += map->pr_vaddr;
+		if (ehdr.e_type != ET_EXEC)
+			sym.st_value += map->pr_vaddr;
 		(*func)(cd, &sym, s);
 	}
 	error = 0;