Fixed some network race conditions

1 files changed, 8 insertions, 1 deletions

diff --git a/kernel/features/syscall.c b/kernel/features/syscall.c
index 3ee5a82..0328f47 100644
--- a/kernel/features/syscall.c
+++ b/kernel/features/syscall.c
@@ -97,7 +97,13 @@ void syscall_handler(struct regs *r)
 		break;
 	}
 	case SYS_NET_CLOSE: {
-		net_close((void *)r->ebx);
+		struct socket *s = (void *)r->ebx;
+		if (s->type == S_TCP && s->state != S_CLOSED) {
+			proc_current()->state = PROC_SLEEPING;
+			proc_yield(r);
+			return;
+		}
+		r->eax = net_close(s);
 		break;
 	}
 	case SYS_NET_CONNECT: {
@@ -112,6 +118,7 @@ void syscall_handler(struct regs *r)
 		if (!net_data_available((void *)r->ebx)) {
 			proc_current()->state = PROC_SLEEPING;
 			proc_yield(r);
+			return;
 		}
 		r->eax = net_receive((void *)r->ebx, (void *)r->ecx, r->edx);
 		break;