Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-01 00:51:19 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Always init Mach-O options with defaults ##bin

Browse Source
This commit is contained in:
Francesco Tamagni 2021-10-29 10:31:04 +02:00 committed by pancake
parent 86d94018a1
commit bf3dd3ce15
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libr/bin/p/bin_xnu_kernelcache.c
View File

@ -139,9 +139,9 @@ static void rebase_buffer(RKernelCacheObj *obj, ut64 off, RIODesc *fd, ut8 *buf,
static void rebase_buffer_fixup(RKernelCacheObj *kobj, ut64 off, RIODesc *fd, ut8 *buf, int count);
static RPrelinkRange *get_prelink_info_range_from_mach0(struct MACH0_(obj_t) *mach0);
static RList *filter_kexts(RKernelCacheObj *obj);
static RList *carve_kexts(RKernelCacheObj *obj);
static RList *kexts_from_load_commands(RKernelCacheObj *obj);
static RList *filter_kexts(RKernelCacheObj *obj, RBinFile *bf);
static RList *carve_kexts(RKernelCacheObj *obj, RBinFile *bf);
static RList *kexts_from_load_commands(RKernelCacheObj *obj, RBinFile *bf);
static void sections_from_mach0(RList *ret, struct MACH0_(obj_t) *mach0, RBinFile *bf, ut64 paddr, char *prefix, RKernelCacheObj *obj);
static void handle_data_sections(RBinSection *sect);
@ -155,8 +155,8 @@ static int prot2perm (int x);
static void r_kext_free(RKext *kext);
static void r_kext_fill_text_range(RKext *kext);
static int kexts_sort_vaddr_func(const void *a, const void *b);
static struct MACH0_(obj_t) *create_kext_mach0(RKernelCacheObj *obj, RKext *kext);
static struct MACH0_(obj_t) *create_kext_shared_mach0(RKernelCacheObj *obj, RKext *kext);
static struct MACH0_(obj_t) *create_kext_mach0(RKernelCacheObj *obj, RKext *kext, RBinFile *bf);
static struct MACH0_(obj_t) *create_kext_shared_mach0(RKernelCacheObj *obj, RKext *kext, RBinFile *bf);
#define r_kext_index_foreach(index, i, item)\
if (index)\
@ -170,7 +170,7 @@ static void process_kmod_init_term(RKernelCacheObj *obj, RKext *kext, RList *ret
static void create_initterm_syms(RKext *kext, RList *ret, int type, ut64 *pointers);
static void process_constructors(RKernelCacheObj *obj, struct MACH0_(obj_t) *mach0, RList *ret, ut64 paddr, bool is_first, int mode, const char *prefix);
static RBinAddr *newEntry(ut64 haddr, ut64 vaddr, int type);
static void ensure_kexts_initialized(RKernelCacheObj *obj);
static void ensure_kexts_initialized(RKernelCacheObj *obj, RBinFile *bf);
static void r_kernel_cache_free(RKernelCacheObj *obj);
@ -247,7 +247,7 @@ beach:
return false;
}
static void ensure_kexts_initialized(RKernelCacheObj *obj) {
static void ensure_kexts_initialized(RKernelCacheObj *obj, RBinFile *bf) {
if (obj->kexts_initialized) {
return;
}
@ -256,7 +256,7 @@ static void ensure_kexts_initialized(RKernelCacheObj *obj) {
RList *kexts = NULL;
if (obj->prelink_info) {
kexts = filter_kexts (obj);
kexts = filter_kexts (obj, bf);
}
if (kexts && !r_list_length (kexts)) {
@ -265,7 +265,7 @@ static void ensure_kexts_initialized(RKernelCacheObj *obj) {
}
if (!kexts) {
kexts = kexts_from_load_commands (obj);
kexts = kexts_from_load_commands (obj, bf);
}
if (kexts && !r_list_length (kexts)) {
@ -274,7 +274,7 @@ static void ensure_kexts_initialized(RKernelCacheObj *obj) {
}
if (!kexts) {
kexts = carve_kexts (obj);
kexts = carve_kexts (obj, bf);
}
obj->kexts = r_kext_index_new (kexts);
@ -346,7 +346,7 @@ static RPrelinkRange *get_prelink_info_range_from_mach0(struct MACH0_(obj_t) *ma
return prelink_range;
}
static RList *filter_kexts(RKernelCacheObj *obj) {
static RList *filter_kexts(RKernelCacheObj *obj, RBinFile *bf) {
RCFValueArray *kext_array = NULL;
RListIter *iter;
RCFKeyValue *item;
@ -433,7 +433,7 @@ static RList *filter_kexts(RKernelCacheObj *obj) {
}
prev_kext = kext;
kext->mach0 = create_kext_mach0 (obj, kext);
kext->mach0 = create_kext_mach0 (obj, kext, bf);
if (!kext->mach0) {
r_kext_free (kext);
continue;
@ -462,7 +462,7 @@ static ut64 r_ptr (ut8 *buf, RKernelCacheObj *obj) {
return K_PPTR (decorated_addr);
}
static RList *carve_kexts(RKernelCacheObj *obj) {
static RList *carve_kexts(RKernelCacheObj *obj, RBinFile *bf) {
struct section_t *sections = NULL;
if (!(sections = MACH0_(get_sections) (obj->mach0))) {
return NULL;
@ -560,7 +560,7 @@ static RList *carve_kexts(RKernelCacheObj *obj) {
kext->vaddr = K_RPTR (bytes);
kext->range.offset = kext->vaddr - pa2va_exec;
kext->mach0 = create_kext_mach0 (obj, kext);
kext->mach0 = create_kext_mach0 (obj, kext, bf);
if (!kext->mach0) {
r_kext_free (kext);
continue;
@ -606,7 +606,7 @@ beach:
return NULL;
}
static RList *kexts_from_load_commands(RKernelCacheObj *obj) {
static RList *kexts_from_load_commands(RKernelCacheObj *obj, RBinFile *bf) {
RList *kexts = r_list_newf ((RListFree) &r_kext_free);
if (!kexts) {
return NULL;
@ -654,7 +654,7 @@ static RList *kexts_from_load_commands(RKernelCacheObj *obj) {
kext->vaddr = vaddr;
kext->range.offset = paddr;
kext->mach0 = create_kext_shared_mach0 (obj, kext);
kext->mach0 = create_kext_shared_mach0 (obj, kext, bf);
if (!kext->mach0) {
free (padded_name);
r_kext_free (kext);
@ -797,9 +797,10 @@ static RKext *r_kext_index_vget(RKextIndex *index, ut64 vaddr) {
return NULL;
}
static struct MACH0_(obj_t) *create_kext_mach0(RKernelCacheObj *obj, RKext *kext) {
static struct MACH0_(obj_t) *create_kext_mach0(RKernelCacheObj *obj, RKext *kext, RBinFile *bf) {
RBuffer *buf = r_buf_new_slice (obj->cache_buf, kext->range.offset, r_buf_size (obj->cache_buf) - kext->range.offset);
struct MACH0_(opts_t) opts;
MACH0_(opts_set_default) (&opts, bf);
opts.verbose = true;
opts.header_at = 0;
struct MACH0_(obj_t) *mach0 = MACH0_(new_buf) (buf, &opts);
@ -807,9 +808,10 @@ static struct MACH0_(obj_t) *create_kext_mach0(RKernelCacheObj *obj, RKext *kext
return mach0;
}
static struct MACH0_(obj_t) *create_kext_shared_mach0(RKernelCacheObj *obj, RKext *kext) {
static struct MACH0_(obj_t) *create_kext_shared_mach0(RKernelCacheObj *obj, RKext *kext, RBinFile *bf) {
RBuffer *buf = r_buf_ref (obj->cache_buf);
struct MACH0_(opts_t) opts;
MACH0_(opts_set_default) (&opts, bf);
opts.verbose = false;
opts.header_at = kext->range.offset;
struct MACH0_(obj_t) *mach0 = MACH0_(new_buf) (buf, &opts);
@ -1036,7 +1038,7 @@ static RList *sections(RBinFile *bf) {
}
RKernelCacheObj *kobj = (RKernelCacheObj*) obj->bin_obj;
ensure_kexts_initialized (kobj);
ensure_kexts_initialized (kobj, bf);
int iter;
RKext *kext;
@ -1196,7 +1198,7 @@ static RList *symbols(RBinFile *bf) {
r_list_free (subsystem);
}
ensure_kexts_initialized (obj);
ensure_kexts_initialized (obj, bf);
RKext *kext;
int kiter;
@ -1665,7 +1667,7 @@ static void symbols_from_stubs(RList *ret, HtPP *kernel_syms_by_addr, RKernelCac
continue;
}
ensure_kexts_initialized (obj);
ensure_kexts_initialized (obj, bf);
RKext *remote_kext = r_kext_index_vget (obj->kexts, target_addr);
if (!remote_kext) {
continue;