[crypto] Check that common name contains no NUL characters

Signed-off-by: Michael Brown <mcb30@ipxe.org>
ipxe · May 8, 2012 · 6c8fcd4 · 6c8fcd4
1 parent 0ad8b60
commit 6c8fcd4
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/crypto/x509.c b/src/crypto/x509.c
@@ -575,6 +575,15 @@ static int x509_parse_common_name ( struct x509_certificate *cert, char **name,
 		if ( ! *name )
 			return -ENOMEM;
 		memcpy ( *name, name_cursor.data, name_cursor.len );
+
+		/* Check that name contains no NULs */
+		if ( strlen ( *name ) != name_cursor.len ) {
+			DBGC ( cert, "X509 %p contains malicious commonName:\n",
+			       cert );
+			DBGC_HDA ( cert, 0, raw->data, raw->len );
+			return rc;
+		}
+
 		return 0;
 	}