Fix a 1 byte overflow in r2cmd and improve logic checks ##crash

binr/radare2/radare2.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2009-2023 - pancake */
+/* radare - LGPL - Copyright 2009-2024 - pancake */
 
 #include <r_main.h>
 
@@ -43,38 +43,39 @@ void r2_asmjs_openurl(void *kore, const char *url) {
 	}
 }
 #else
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
+
 static void r2cmd(int in, int out, const char *cmd) {
-	size_t cmd_len = strlen (cmd) + 1;
+	int cmd_len = strlen (cmd) + 1;
-	if (write (out, cmd, cmd_len) != cmd_len) {
+	if ((int)write (out, cmd, cmd_len) != cmd_len) {
 		return;
 	}
+#if 0
 	if (write (out, "\n", 1) != 1) {
 		return;
 	}
-	int bufsz = (1024 * 64);
+#endif
-	unsigned char *buf = malloc (bufsz);
+	int bufsz = (1024 * 64) - 1;
-	if (!buf) {
+	ut8 *buf = malloc (bufsz + 1);
+	if (R_UNLIKELY (!buf)) {
 		return;
 	}
-	while (1) {
+	int n = read (in, buf, bufsz);
-		int n = read (in, buf, bufsz);
+	if (R_LIKELY (n > 0)) {
-		if (n < 1) {
+		buf[R_MIN (n, bufsz)] = 0;
-			break;
-		}
-		buf[n] = '\0';
-		buf[bufsz - 1] = '\0';
 		int len = strlen ((const char *)buf);
-		n = len;
+		if (len > 0) {
-		if (n < 1) {
+			n = write (STDOUT_FILENO, buf, len);
-			break;
+			if (n != len) {
-		}
+				R_LOG_ERROR ("Truncated output");
-		n = write (1, buf, n);
+			}
-		if (n != bufsz) {
-			break;
 		}
 	}
 	free (buf);
-	write (1, "\n", 1);
+	write (STDOUT_FILENO, "\n", 1);
 }
 
 static int r_main_r2pipe(int argc, const char **argv) {

libr/search/privkey.c

@@ -2,6 +2,7 @@
 // By Nadia Heninger and J. Alex Halderman
 // Contribution to r2 by @santitox
 // Integrated and refactored by jvoisin and spelissier
+// Updated by Sylvain Pelissier 2024
 
 #include <r_search.h>
 #include <r_crypto/r_ed25519.h>
@@ -68,6 +69,7 @@ static int check_fields(const ut8 *start) {
 // As defined in RFC 3447 for RSA, as defined in RFC 5915 for
 // elliptic curves and as defined in 7 of RFC 8410 for SafeCurves
 R_IPI int search_asn1_privkey_update(RSearch *s, ut64 from, const ut8 *buf, int len) {
+	R_RETURN_VAL_IF_FAIL (s && buf, -1);
 	int i, k, max, index, t;
 	RListIter *iter;
 	RSearchKeyword *kw;
@@ -120,16 +122,9 @@ R_IPI int search_asn1_privkey_update(RSearch *s, ut64 from, const ut8 *buf, int
 	return -1;
 }
 
-static inline void hexprint(const ut8 *data, int len) {
-	int i = 0;
-	for (i = 0; i < len; i++) {
-		r_cons_printf ("%02x", data[i]);
-	}
-	r_cons_newline ();
-}
-
 // Finds and return index of a private key matching a given public key.
 R_IPI int search_raw_privkey_update(RSearch *s, ut64 from, const ut8 *buf, int len) {
+	R_RETURN_VAL_IF_FAIL (s && buf, -1);
 	int t, i;
 	RSearchKeyword *kw;
 	RListIter *iter;
@@ -156,4 +151,4 @@ R_IPI int search_raw_privkey_update(RSearch *s, ut64 from, const ut8 *buf, int l
 		}
 	}
 	return -1;
-}
+}