cleaned up some code that was causing warnings etc.

Author: elfmaster

Makefile

@@ -29,7 +29,7 @@ interp:
 	$(CC) $(GCC_OPTS) shiva_transform.c -o	shiva_transform.o
 	$(CC) $(GCC_OPTS) shiva_so.c -o		shiva_so.o
 	$(CC) $(GCC_OPTS) -fno-stack-protector shiva_post_linker.c -o shiva_post_linker.o
-	$(MUSL) -static -Wl,-undefined=system -Wl,-undefined=prctl -Wl,-undefined=pause -Wl,-undefined=puts -Wl,-undefined=putchar $(OBJ_LIST) $(STATIC_LIBS) -o $(BUILD_DIR)/shiva
+	$(MUSL) -static $(OBJ_LIST) $(STATIC_LIBS) -o $(BUILD_DIR)/shiva
 
 shiva-ld:
 	make -C tools/shiva-ld

shiva.h

@@ -803,9 +803,11 @@ struct shiva_trace_handler * shiva_trace_find_handler(struct shiva_ctx *, void *
 struct shiva_trace_bp * shiva_trace_bp_struct(void *);
 bool shiva_trace_set_breakpoint(shiva_ctx_t *, void * (*)(void *), uint64_t, void *, shiva_error_t *);
 bool shiva_trace_write(struct shiva_ctx *, pid_t, void *, const void *, size_t, shiva_error_t *);
+#if __x86_64__
 void __attribute__((naked)) shiva_trace_getregs_x86_64(struct shiva_trace_regset_x86_64 *);
 void __attribute__((naked)) shiva_trace_setjmp_x86_64(shiva_trace_jumpbuf_t *);
 void shiva_trace_longjmp_x86_64(shiva_trace_jumpbuf_t *jumpbuf, uint64_t ip);
+#endif
 uint64_t shiva_trace_base_addr(struct shiva_ctx *);
 /*
  * shiva_trace_thread.c
@@ -835,3 +837,8 @@ bool shiva_so_resolve_symbol(struct shiva_module *, char *, struct elf_symbol *,
  */
 void shiva_post_linker(void);
 #endif
+
+/*
+ * debug stub to set breakpoints on.
+ */
+int test_mark(void);

shiva_analyze.c

@@ -460,7 +460,7 @@ shiva_analyze_find_calls(struct shiva_ctx *ctx)
 				symbol.bind = STB_GLOBAL;
 				symbol.type = STT_OBJECT;
 				symbol.visibility = STV_PROTECTED;
-				if (elf_section_index_by_name(&ctx->elfobj, shdr.name, &symbol.shndx)
+				if (elf_section_index_by_name(&ctx->elfobj, shdr.name, (uint64_t *)&symbol.shndx)
 				    == false) {
 					fprintf(stderr, "Failed to find section index for %s in %s\n",
 					    shdr.name, elf_pathname(&ctx->elfobj));

shiva_module.c

@@ -590,7 +590,7 @@ resolve_pltgot_entries(struct shiva_module *linker)
 
 						shiva_debug("Symbol '%s' is a PLT entry, let's look it up in the shared libraries\n",
 						    symbol.name);
-						res = shiva_so_resolve_symbol(linker, symbol.name, &tmp, &so_path);
+						res = shiva_so_resolve_symbol(linker, (char *)symbol.name, &tmp, &so_path);
 						if (res == false) {
 							fprintf(stderr, "Failed to resolve symbol '%s' in shared libs\n",
 							    symbol.name);
@@ -640,7 +640,7 @@ resolve_pltgot_entries(struct shiva_module *linker)
 				struct elf_symbol tmp;
 				char path_out[PATH_MAX];
 
-				res = shiva_so_resolve_symbol(linker, symbol.name, &tmp, &so_path);
+				res = shiva_so_resolve_symbol(linker, (char *)symbol.name, &tmp, &so_path);
 				if (res == false) {
 					fprintf(stderr, "Failed to resolve symbol '%s' in shared libs\n",
 					    symbol.name);
@@ -830,7 +830,7 @@ internal_symresolve(struct shiva_module *linker, char *symname,
 	} else if (res == false && linker->mode == SHIVA_LINKING_MICROCODE_PATCH) {
 		char *so_path;
 
-		res = shiva_so_resolve_symbol(linker, symname, &tmp, &so_path);
+		res = shiva_so_resolve_symbol(linker, (char *)symname, &tmp, &so_path);
 		if (res == true) {
 			*type = RESOLVER_TARGET_SO_RESOLVE;
 			*e_type = ET_DYN;
@@ -1098,7 +1098,7 @@ apply_relocation(struct shiva_module *linker, struct elf_relocation rel,
 						 * Insert this as a delayed relocation so that the
 						 * shiva_post_linker code can handle it later.
 						 */
-						res = shiva_so_resolve_symbol(linker, symbol.name, &tmp, &so_path);
+						res = shiva_so_resolve_symbol(linker, (char *)symbol.name, &tmp, &so_path);
 						if (res == false) {
 							fprintf(stderr, "Failed to resolve symbol '%s' in shared libs\n",
 							    symbol.name);
@@ -1668,7 +1668,7 @@ calculate_bss_size(struct shiva_module *linker, size_t *out)
 			if (hsearch_r(e, FIND, &ep, &linker->cache.bss) != 0)
 				continue;
 			bss_entry = shiva_malloc(sizeof(*bss_entry));
-			bss_entry->symname = symbol.name;
+			bss_entry->symname = (char *)symbol.name;
 			bss_entry->addr = linker->bss_vaddr + var_offset;
 			bss_entry->offset = var_offset;
 			var_offset += symbol.size;
@@ -2409,7 +2409,7 @@ validate_transformations(struct shiva_ctx *ctx, struct shiva_module *linker)
 				    sizeof(struct elf_symbol));
 				memcpy(&transform->source_symbol, &tf_sym,
 				    sizeof(struct elf_symbol));
-				transform->name = target_sym.name;
+				transform->name = (char *)target_sym.name;
 				transform->ptr = NULL;
 				shiva_debug("Source symbol '%s' value: %zu size: %zu\n",
 				    transform->source_symbol.name, transform->source_symbol.value, transform->source_symbol.size);
@@ -2579,7 +2579,7 @@ validate_transformations(struct shiva_ctx *ctx, struct shiva_module *linker)
 			    transform->source_symbol.value);
 			if (elf_section_by_name(&linker->elfobj, ".text", &text_shdr) == false) {
 				fprintf(stderr,
-				    "elf_section_by_name(%p, \".text\", ...) failed\n");
+				    "elf_section_by_name(%p, \".text\", ...) failed\n", &linker->elfobj);
 				return false;
 			}
 			if (next_func.value == transform->source_symbol.value) {

shiva_post_linker.c

@@ -61,8 +61,9 @@ shiva_post_linker(void)
 	    ELF_PAGEALIGN(ctx_global->module.runtime->text_size,
 	    PAGE_SIZE),
 	    PROT_READ|PROT_EXEC) < 0) {
+		fprintf(stderr, "shiva_post_linker() Unable to mark text as read-only\n");
 		perror("mprotect");
-		return false;
+		exit(EXIT_FAILURE);
 	}
 
 	__asm__ __volatile__ ("mov x21, %0" :: "r"(ctx_global->ulexec.entry_point));

shiva_trace.c

@@ -7,9 +7,9 @@ static bool shiva_trace_op_peek(struct shiva_ctx *, pid_t,
  * XXX FIXME
  * temporary version.
  */
+#if __x86_64__
 void __attribute__((naked)) shiva_trace_getregs_x86_64(struct shiva_trace_regset_x86_64 *regs)
 {
-#if defined(__x86_64__)
 	__asm__ __volatile__(
 		"movq %rax, (%rdi)\n\t"
 		"movq %rbx, 8(%rdi)\n\t"
@@ -26,7 +26,6 @@ void __attribute__((naked)) shiva_trace_getregs_x86_64(struct shiva_trace_regset
 		"movq %r15, 104(%rdi)\n\t"
 		"ret\n\t"
 		);
-#endif
 }
 
 /*
@@ -37,7 +36,6 @@ void __attribute__((naked)) shiva_trace_getregs_x86_64(struct shiva_trace_regset
  */
 void __attribute__ ((naked)) shiva_trace_setjmp_x86_64(shiva_trace_jumpbuf_t *jmpbuf)
 {
-#if defined(__x86_64__)
 	__asm__ __volatile__(
 		"movq %rax, 0(%rdi)\n\t"
 		"movq %rbx, 8(%rdi)\n\t"
@@ -58,12 +56,10 @@ void __attribute__ ((naked)) shiva_trace_setjmp_x86_64(shiva_trace_jumpbuf_t *jm
 		"xor  %rax, %rax\n\t"
 		"ret\n\t"
 		);
-#endif
 }
 
 void shiva_trace_longjmp_x86_64(shiva_trace_jumpbuf_t *jumpbuf, uint64_t ip)
 {
-#if defined(__x86_64__)
 	__asm__ __volatile__(
 		"movq 0(%rdi), %rax\n\t"
 		"movq 8(%rdi), %rbx\n\t"
@@ -84,8 +80,8 @@ void shiva_trace_longjmp_x86_64(shiva_trace_jumpbuf_t *jumpbuf, uint64_t ip)
 	__asm__ __volatile__ (
 			"movq %0, %%rdx\n\t"
 			"jmp *%%rdx" :: "r"(ip));
-#endif
 }
+#endif
 
 uint64_t
 shiva_trace_base_addr(struct shiva_ctx *ctx)
@@ -510,28 +506,11 @@ shiva_trace_set_breakpoint(struct shiva_ctx *ctx, void * (*handler_fn)(void *),
 								 */
 								bp->plt_addr = branch_site->target_vaddr;
 
-#if 0
 								/*
 								 * We cannot use an hcreate cache because there's
 								 * some incompatibility when using it cross module
 								 * execution.
 								 */
-								val = branch_site->retaddr + ctx->ulexec.base_vaddr;
-								sprintf(tmp, "%#lx", val);
-								memcpy(ptr_val, &val, sizeof(val));
-								e.key = (char *)tmp;
-								e.data = (void *)ptr_val;
-								printf("Adding PLT retaddr %s to cache\n", e.key);
-								printf("data: %#lx\n", *(uint64_t *)e.data);
-								if (hsearch_r(e, ENTER, &ep, &bp->valid_plt_retaddrs) == 0) {
-									shiva_error_set(error, "hsearch_r failed: %s\n",
-									    strerror(errno));
-									return false;
-								}
-								if (hsearch_r(e, FIND, &ep, &bp->valid_plt_retaddrs) != 0) {
-									printf("FOUND IT: data: %#lx\n", *(uint64_t *)e.data);
-								}
-#endif
 							}
 						}
 						TAILQ_INSERT_TAIL(&current->bp_tqlist, bp, _linkage);