sys64738
/
dynamic-dso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix things

This commit is contained in:
Triss 2025-02-14 23:27:59 +01:00
parent 17ba132839
commit da41d9d21b
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -12,8 +12,8 @@ default: release #debug
example: default example.elf example: default example.elf
example-%: % example.elf example-%: % example.elf
debug: CFLAGS += -g -Og -fsanitize=address debug: CFLAGS += -g -Og #-fsanitize=address
debug: LDFLAGS += -g -Og -fsanitize=address debug: LDFLAGS += -g -Og #-fsanitize=address
debug: all debug: all
release: CFLAGS += -O2 -flto -ffat-lto-objects release: CFLAGS += -O2 -flto -ffat-lto-objects
@ -33,7 +33,7 @@ libdynso.so: dynso.o
$(CC) -Wl,-soname=$@ -shared -o "$@" $^ $(CFLAGS) $(CC) -Wl,-soname=$@ -shared -o "$@" $^ $(CFLAGS)
example.elf: dynso.c example.c example.elf: dynso.c example.c
$(CC) -o "$@" $^ $(CFLAGS) $(LDFLAGS) $(LIBS) -g -Og -fsanitize=address $(CC) -o "$@" $^ $(CFLAGS) $(LDFLAGS) $(LIBS) -g -Og #-fsanitize=address
clean: clean:
$(RM) *.o *.so *.a example.elf $(RM) *.o *.so *.a example.elf

13
dynso.c
View File

@ -305,6 +305,19 @@ static enum dynso_err inject_in_scope_of(struct inject_undo_info* r,
struct r_scope_elem* oldscope = vic3->l_scope[0]; struct r_scope_elem* oldscope = vic3->l_scope[0];
struct r_scope_elem* scope = NULL; struct r_scope_elem* scope = NULL;
if ((uintptr_t)&oldscope->r_nlist < 0x1000000 || oldscope->r_nlist > 0x10000) {
// things probably broke, use offsets from an older glibc version that
// hopefully do check out. this is super hacky, be warned
// (extra "l_text_end" field shifts everything one field down)
oldscope = ((struct r_scope_elem**)vic3->l_local_scope)[0];
if ((uintptr_t)&oldscope->r_nlist < 0x1000000 || oldscope->r_nlist > 0x10000) {
fprintf(stderr, "[%s:%d]: WELP, THINGS BROKE BADLY. time to stare at glibc internals again to see if you can fix it. Have fun!\n", __FILE__, __LINE__);
return dynso_death;
}
}
scope = (struct r_scope_elem*)calloc(1, sizeof(*scope) scope = (struct r_scope_elem*)calloc(1, sizeof(*scope)
+ sizeof(struct link_map_priv1*)*(oldscope->r_nlist+1)); + sizeof(struct link_map_priv1*)*(oldscope->r_nlist+1));
if (scope == NULL) return dynso_oom; if (scope == NULL) return dynso_oom;

1
dynso.h
View File

@ -27,6 +27,7 @@ enum dynso_err {
dynso_no_newobj, // can't create a new symbol dynso_no_newobj, // can't create a new symbol
dynso_no_priv2, // can't find the offset of the priv2 part of a struct link_map dynso_no_priv2, // can't find the offset of the priv2 part of a struct link_map
dynso_no_priv3, // can't find the offset of the priv3 part of a struct link_map dynso_no_priv3, // can't find the offset of the priv3 part of a struct link_map
dynso_death, // too many changes in glibc versioning
}; };
// create a library // create a library

3
dynso_internal.h
View File

@ -75,6 +75,7 @@ struct link_map_priv2 {
lt_library, lt_library,
lt_loaded lt_loaded
} l_type : 2; } l_type : 2;
// NOTE: extra bitfields seem to get added relatively commonly. just don't use them I guess
unsigned int l_relocated : 1; unsigned int l_relocated : 1;
unsigned int l_init_called : 1; unsigned int l_init_called : 1;
unsigned int l_global : 1; unsigned int l_global : 1;
@ -121,7 +122,7 @@ struct link_map_priv3 {
ElfW(Versym)* l_versyms; ElfW(Versym)* l_versyms;
const char* l_origin; const char* l_origin;
ElfW(Addr) l_map_start, l_map_end; ElfW(Addr) l_map_start, l_map_end;
ElfW(Addr) l_text_end; //ElfW(Addr) l_text_end; // NOTE: got removed in. 2.39? maybe??
struct r_scope_elem* l_scope_mem[4]; struct r_scope_elem* l_scope_mem[4];
size_t l_scope_max; size_t l_scope_max;
struct r_scope_elem** l_scope; struct r_scope_elem** l_scope;