Add support for esil.{romem/nonull} in core_esil

Author: condret

libr/core/cconfig.c

@@ -2609,26 +2609,48 @@ static bool cb_graphformat(void *user, void *data) {
 }
 
 static bool cb_exectrap(void *user, void *data) {
-	RConfigNode *node = (RConfigNode *) data;
-	RCore *core = (RCore*) user;
+	RConfigNode *node = (RConfigNode *)data;
+	RCore *core = (RCore*)user;
 	if (core->anal && core->anal->esil) {
 		core->anal->esil->exectrap = node->i_value;
 	}
 	return true;
 }
 
 static bool cb_iotrap(void *user, void *data) {
-	RConfigNode *node = (RConfigNode *) data;
-	RCore *core = (RCore*) user;
+	RConfigNode *node = (RConfigNode *)data;
+	RCore *core = (RCore*)user;
 	if (core->anal && core->anal->esil) {
 		core->anal->esil->iotrap = node->i_value;
 	}
 	return true;
 }
 
+static bool cb_romem(void *user, void *data) {
+	RConfigNode *node = (RConfigNode *)data;
+	RCore *core = (RCore*)user;
+	if (node->i_value) {
+		core->esil.cfg |= R_CORE_ESIL_RO;
+	} else {
+		core->esil.cfg &= ~R_CORE_ESIL_RO;
+	}
+	return true;
+}
+
+static bool cb_esilnonull(void *user, void *data) {
+	RConfigNode *node = (RConfigNode *)data;
+	RCore *core = (RCore*)user;
+	if (node->i_value) {
+		core->esil.cfg |= R_CORE_ESIL_NONULL;
+	} else {
+		core->esil.cfg &= ~R_CORE_ESIL_NONULL;
+	}
+	return true;
+}
+
 static bool cb_scr_bgfill(void *user, void *data) {
-	RCore *core = (RCore*) user;
-	RConfigNode *node = (RConfigNode *) data;
+	RCore *core = (RCore*)user;
+	RConfigNode *node = (RConfigNode *)data;
 	if (node->i_value) {
 		core->print->flags |= R_PRINT_FLAGS_BGFILL;
 	} else {
@@ -4310,9 +4332,9 @@ R_API int r_core_config_init(RCore *core) {
 
 	SETCB ("esil.exectrap", "false", &cb_exectrap, "trap when executing code in non-executable memory");
 	SETCB ("esil.iotrap", "true", &cb_iotrap, "invalid read or writes produce a trap exception");
-	SETBPREF ("esil.romem", "false", "set memory as read-only for ESIL");
+	SETCB ("esil.romem", "false", &cb_romem, "set memory as read-only for ESIL");
 	SETBPREF ("esil.stats", "false", "statistics from ESIL emulation stored in sdb");
-	SETBPREF ("esil.nonull", "false", "prevent memory read, memory write at null pointer");
+	SETCB ("esil.nonull", "false", &cb_esilnonull, "prevent memory read, memory write at null pointer");
 	SETCB ("esil.mdev.range", "", &cb_mdevrange, "specify a range of memory to be handled by cmd.esil.mdev");
 	SETBPREF ("esil.dfg.mapinfo", "false", "use mapinfo for esil dfg");
 	SETBPREF ("esil.dfg.maps", "false", "set ro maps for esil dfg");

libr/core/core_esil.c

@@ -58,11 +58,48 @@ static bool core_esil_mem_switch (void *core, ut32 idx) {
 }
 
 static bool core_esil_mem_read (void *core, ut64 addr, ut8 *buf, int len) {
-	return r_io_read_at (((RCore *)core)->io, addr, buf, len);
+	if ((UT64_MAX - len + 1) < addr) {
+		if (!core_esil_mem_read (core, 0ULL, buf + (UT64_MAX - addr + 1),
+			len - (UT64_MAX - addr + 1))) {
+			return false;
+		}
+		len = UT64_MAX - addr + 1;
+	}
+	RCore *c = core;
+	if (!addr && c->esil.cfg & R_CORE_ESIL_NONULL) {
+		return false;
+	}
+	return r_io_read_at (c->io, addr, buf, len);
 }
 
 static bool core_esil_mem_write (void *core, ut64 addr, const ut8 *buf, int len) {
-	return r_io_write_at (((RCore *)core)->io, addr, buf, len);
+	if ((UT64_MAX - len + 1) < addr) {
+		if (!core_esil_mem_write (core, 0ULL, buf + (UT64_MAX - addr + 1),
+			len - (UT64_MAX - addr + 1))) {
+			return false;
+		}
+		len = UT64_MAX - addr + 1;
+	}
+	RCore *c = core;
+	if (!addr && c->esil.cfg & R_CORE_ESIL_NONULL) {
+		return false;
+	}
+	if (c->esil.cfg & R_CORE_ESIL_RO) {
+		RIORegion region;
+		if (!r_io_get_region_at (c->io, &region, addr)) {
+			//maybe check voidwrites config here
+			return true;
+		}
+		if (!(region.perm & R_PERM_W)) {
+			return false;
+		}
+		if (r_itv_contain (region.itv, addr + len - 1)) {
+			return true;
+		}
+		return core_esil_mem_write (core, r_itv_end (region.itv),
+			NULL, addr + len - r_itv_end (region.itv));	//no need to pass buf, because this is RO mode
+	}
+	return r_io_write_at (c->io, addr, buf, len);
 }
 
 static REsilMemInterface core_esil_mem_if = {
@@ -101,14 +138,15 @@ R_API void r_core_esil_fini(RCoreEsil *cesil) {
 	r_esil_fini (&cesil->esil);
 	if (cesil->reg) {
 		r_reg_free (cesil->reg);
+		cesil->reg = NULL;
 	}
-	free (cesil->cmd_step);
-	free (cesil->cmd_step_out);
-	free (cesil->cmd_intr);
-	free (cesil->cmd_trap);
-	free (cesil->cmd_mdev);
-	free (cesil->cmd_todo);
-	free (cesil->cmd_ioer);
-	free (cesil->mdev_range);
-	*cesil = (const RCoreEsil){0};
+	R_FREE (cesil->cmd_step);
+	R_FREE (cesil->cmd_step_out);
+	R_FREE (cesil->cmd_intr);
+	R_FREE (cesil->cmd_trap);
+	R_FREE (cesil->cmd_mdev);
+	R_FREE (cesil->cmd_todo);
+	R_FREE (cesil->cmd_ioer);
+	R_FREE (cesil->mdev_range);
+	cesil->esil = (const REsil){0};
 }

libr/include/r_core.h

@@ -313,8 +313,12 @@ typedef struct r_core_esil_t {
 	char *cmd_todo;		// command to run when esil expr contains TODO
 	char *cmd_ioer;		// command to run when esil fails to IO
 	char *mdev_range;	// string containing the r_str_range to match for read/write accesses
+	ut8 cfg;
 } RCoreEsil;
 
+#define	R_CORE_ESIL_RO		0x1
+#define	R_CORE_ESIL_NONULL	0x2
+
 typedef struct RCorePriv RCorePriv;
 
 struct r_core_t {