Fix radareorg#16347: o+ sets maps as writable like oo+

kazarmy · Apr 1, 2020 · e8c393a · e8c393a
1 parent 9ae037e
commit e8c393a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/libr/core/cmd_open.c b/libr/core/cmd_open.c
@@ -1390,6 +1390,7 @@ static int cmd_open(void *data, const char *input) {
 		break;
 	case '+': // "o+"
 		perms |= R_PERM_W;
+		/* fallthrough */
 	case ' ': // "o" "o "
 		ptr = input + 1;
 		argv = r_str_argv (ptr, &argc);
@@ -1422,6 +1423,15 @@ static int cmd_open(void *data, const char *input) {
 					addr = UT64_MAX;
 				}
 				r_core_bin_load (core, argv0, addr);
+				if (*input == '+') { // "o+"
+					SdbListIter *iter;
+					RIOMap *map;
+					ls_foreach_prev (core->io->maps, iter, map) {
+						if (map->fd == fd) {
+							map->perm |= R_PERM_WX;
+						}
+					}
+				}
 			} else {
 				eprintf ("cannot open file %s\n", argv0);
 			}

diff --git a/test/new/db/cmd/cmd_open b/test/new/db/cmd/cmd_open
@@ -338,10 +338,10 @@ om
 # pv1
 EOF
 EXPECT=<<EOF
- 5 fd: 3 +0x00000000 0x00000000 - 0x0000347f r-- fmap.LOAD0
- 4 fd: 3 +0x00004000 0x00004000 - 0x00016790 r-x fmap.LOAD1
- 3 fd: 3 +0x00017000 0x00017000 - 0x0001f7bf r-- fmap.LOAD2
- 2 fd: 3 +0x00020050 0x00021050 - 0x00022267 rw- fmap.LOAD3
+ 5 fd: 3 +0x00000000 0x00000000 - 0x0000347f rwx fmap.LOAD0
+ 4 fd: 3 +0x00004000 0x00004000 - 0x00016790 rwx fmap.LOAD1
+ 3 fd: 3 +0x00017000 0x00017000 - 0x0001f7bf rwx fmap.LOAD2
+ 2 fd: 3 +0x00020050 0x00021050 - 0x00022267 rwx fmap.LOAD3
  1 fd: 4 +0x00000000 0x00022268 - 0x00023557 rw- mmap.LOAD3
 EOF
 RUN