fix weird crash in iso9660 with stricter kfree, make sure error messages are shown with interrupts off by forcibly flipping backbuffer

Author: braindigitalis

src/dhcp.c

@@ -52,7 +52,6 @@ void dhcp_discover() {
 		return;
 	}
 	udp_register_daemon(DHCP_DST_PORT, &dhcp_handle_packet);
-	kprintf("Configuring network via DHCP\n");
 	memset(packet, 0, sizeof(dhcp_packet_t));
 	uint16_t optsize = make_dhcp_packet(packet, DHCPDISCOVER, request_ip, DHCP_TRANSACTION_IDENTIFIER, 0);
 	udp_send_packet(dst_ip, DHCP_DST_PORT, DHCP_SRC_PORT, packet, optsize);

src/e1000.c

@@ -180,7 +180,7 @@ void e1000_handle_receive() {
 		return;
 	}
 	netdev_t* dev = get_active_network_device();
-	if (!dev && dev->deviceid != ((INTEL_VEND << 16) | e1000_device_id)) {
+	if (!dev || dev->deviceid != ((INTEL_VEND << 16) | e1000_device_id)) {
 		return;
 	}
 
@@ -212,6 +212,10 @@ bool e1000_send_packet(void *p_data, uint16_t p_len) {
 		return false;
 	}
 
+	if (!tx_descs[tx_cur]) {
+		return false;
+	}
+
 	// Check if descriptor is available
 	if (!(tx_descs[tx_cur]->status & TX_DD)) {
 		dprintf("e1000: TX ring full, dropping packet\n");
@@ -255,18 +259,6 @@ void e1000_up() {
 void e1000_handler([[maybe_unused]] uint8_t isr, [[maybe_unused]] uint64_t error, [[maybe_unused]] uint64_t irq, void* opaque) {
 	uint32_t status = e1000_read_command(REG_ICR);
 
-	if (status & ICR_TXQE) {
-		dprintf("Transmit queue empty\n");
-	}
-	if (status & ICR_RXSEQ) {
-		dprintf("Recv sequence error\n");
-	}
-	if (status & ICR_LSC) {
-		e1000_up();
-	}
-	if (status & ICR_RXDMT0) {
-		// RX threshold met
-	}
 	if (status & ICR_RXT0) {
 		e1000_handle_receive();
 	}
@@ -298,10 +290,6 @@ void e1000_enable_interrupts() {
 	e1000_read_command(REG_ICR);
 }
 
-void e1000_idle() {
-	//e1000_handler(32 + 10, 0, 10, NULL);
-}
-
 bool e1000_start(pci_dev_t *pci_device) {
 
 	// Cache actual detected device ID
@@ -383,8 +371,6 @@ bool e1000_start(pci_dev_t *pci_device) {
 
 	interrupts_on();
 
-	proc_register_idle(e1000_idle, IDLE_FOREGROUND);
-
 	return true;
 }
 

src/errorhandler.c

@@ -56,6 +56,7 @@ void error_handler(uint8_t int_no, uint64_t errorcode, [[maybe_unused]] uint64_t
 	kprintf("Fatal exception %02X (Error code %016lx): %s\n", int_no, errorcode, error_table[int_no]);
 	setforeground(current_console, COLOUR_WHITE);
 	backtrace();
+	rr_flip();
 	wait_forever();
 }
 

src/iso9660.c

@@ -59,6 +59,10 @@ int parse_pvd(iso9660 *info, unsigned char *buffer) {
 
 fs_directory_entry_t *parse_directory(fs_tree_t *node, iso9660 *info, uint32_t start_lba, uint32_t lengthbytes) {
 
+	if (lengthbytes < 2048) {
+		lengthbytes *= 2048;
+	}
+
 	unsigned char *dirbuffer = kmalloc(lengthbytes);
 	if (!dirbuffer) {
 		return NULL;
@@ -94,7 +98,7 @@ fs_directory_entry_t *parse_directory(fs_tree_t *node, iso9660 *info, uint32_t s
 
 		// Sanity: Does this entry stay within the buffer?
 		if (walkbuffer + fentry->length > dirbuffer + lengthbytes) {
-			kprintf("ISO9660: Directory entry overflows buffer\n");
+			kprintf("ISO9660: Directory entry overflows buffer. fentry->length=%d lengthbytes=%d\n", fentry->length, lengthbytes);
 			break;
 		}
 
@@ -104,7 +108,6 @@ fs_directory_entry_t *parse_directory(fs_tree_t *node, iso9660 *info, uint32_t s
 		if (entrycount > 2) {
 			fs_directory_entry_t *thisentry = kmalloc(sizeof(fs_directory_entry_t));
 			if (!thisentry) {
-				entrycount--;
 				break;
 			}
 
@@ -129,8 +132,6 @@ fs_directory_entry_t *parse_directory(fs_tree_t *node, iso9660 *info, uint32_t s
 			if (info->joliet == 0) {
 				uint32_t safe_len = fentry->filename_length;
 				thisentry->filename = kmalloc(safe_len + 1);
-				dprintf("filename alloc: %d bytes\n", safe_len + 1);
-
 				uint32_t j = 0;
 				char *ptr = fentry->filename;
 
@@ -147,8 +148,6 @@ fs_directory_entry_t *parse_directory(fs_tree_t *node, iso9660 *info, uint32_t s
 			} else {
 				uint32_t safe_len = fentry->filename_length / 2;
 				thisentry->filename = kmalloc(safe_len + 1);
-				dprintf("filename alloc: %d bytes\n", safe_len + 1);
-
 				uint32_t j = 0;
 				char *ptr = fentry->filename;
 
@@ -249,9 +248,10 @@ void *iso_get_directory(void *t) {
 	fs_tree_t *treeitem = (fs_tree_t *) t;
 	if (treeitem) {
 		iso9660 *info = (iso9660 *) treeitem->opaque;
+		dprintf("iso_get_directory size: %d %d %d\n", treeitem->size, info->rootextent_len, treeitem->size ? treeitem->size : info->rootextent_len);
 		return (void *) parse_directory(treeitem, (iso9660 *) treeitem->opaque,
 						treeitem->lbapos ? treeitem->lbapos : info->rootextent_lba,
-						treeitem->size ? treeitem->size : info->rootextent_len);
+						treeitem->size ? treeitem->size : info->rootextent_len * 2048);
 	} else {
 		kprintf("*** BUG *** iso_get_directory: null fs_tree_t*!\n");
 		return NULL;

src/kernel.c

@@ -9,6 +9,7 @@ void kmain()
 		preboot_fail("Failed to mount boot drive to VFS!");
 	}
 
+	kprintf("Bringing up network...\n");
 	netdev_t* network = get_active_network_device();
 	if (network) {
 		kprintf("Active network card: %s\n", network->description);

src/net.c

@@ -95,11 +95,17 @@ uint32_t ntohl(uint32_t netlong) {
 
 void network_up()
 {
+	kprintf(" arp,");
 	arp_init();
+	kprintf(" IP,");
 	ip_init();
+	kprintf(" TCP,");
 	tcp_init();
+	kprintf(" DHCP,");
 	dhcp_discover();
+	kprintf(" DNS");
 	init_dns();
+	kprintf("\n");
 }
 
 void network_down()

src/printf.c

@@ -303,6 +303,7 @@ int dprintf(const char *fmt, ...)
 
 	va_start(args, fmt);
 	rv = dvprintf(fmt, args);
+	//rv = vprintf(fmt, args);
 	va_end(args);
 	return rv;
 }