< prev index next >

src/jdk.hotspot.agent/linux/native/libsaproc/ps_core.c

Print this page

        

*** 349,359 **** break; case PT_LOAD: { if (core_php->p_filesz != 0) { if (add_map_info(ph, ph->core->core_fd, core_php->p_offset, ! core_php->p_vaddr, core_php->p_filesz) == NULL) goto err; } break; } } --- 349,359 ---- break; case PT_LOAD: { if (core_php->p_filesz != 0) { if (add_map_info(ph, ph->core->core_fd, core_php->p_offset, ! core_php->p_vaddr, core_php->p_filesz, core_php->p_flags) == NULL) goto err; } break; } }
*** 388,401 **** uintptr_t target_vaddr = lib_php->p_vaddr + lib_base; map_info *existing_map = core_lookup(ph, target_vaddr); if (existing_map == NULL){ if (add_map_info(ph, lib_fd, lib_php->p_offset, ! target_vaddr, lib_php->p_memsz) == NULL) { goto err; } } else { // Coredump stores value of p_memsz elf field // rounded up to page boundary. if ((existing_map->memsz != page_size) && (existing_map->fd != lib_fd) && --- 388,412 ---- uintptr_t target_vaddr = lib_php->p_vaddr + lib_base; map_info *existing_map = core_lookup(ph, target_vaddr); if (existing_map == NULL){ if (add_map_info(ph, lib_fd, lib_php->p_offset, ! target_vaddr, lib_php->p_memsz, lib_php->p_flags) == NULL) { goto err; } + } else if (lib_php->p_flags != existing_map->flags) { + // Access flags for this memory region are different between the library + // and coredump. It might be caused by mprotect() call at runtime. + // We should respect the coredump. + continue; } else { + // Read only segments in ELF should not be any different from PT_LOAD segments + // in the coredump. + // Also the first page of the ELF header might be included + // in the coredump (See JDK-7133122). + // Thus we need to replace the PT_LOAD segment with the library version. + // // Coredump stores value of p_memsz elf field // rounded up to page boundary. if ((existing_map->memsz != page_size) && (existing_map->fd != lib_fd) &&
*** 458,468 **** // add mappings for PT_LOAD segments case PT_LOAD: { // add only non-writable segments of non-zero filesz if (!(exec_php->p_flags & PF_W) && exec_php->p_filesz != 0) { ! if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz) == NULL) goto err; } break; } // read the interpreter and it's segments --- 469,479 ---- // add mappings for PT_LOAD segments case PT_LOAD: { // add only non-writable segments of non-zero filesz if (!(exec_php->p_flags & PF_W) && exec_php->p_filesz != 0) { ! if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz, exec_php->p_flags) == NULL) goto err; } break; } // read the interpreter and it's segments
< prev index next >