X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fmessages.c;h=4765d65e5ef972b2eadf9ea7c1f0c8b94af03766;hb=2a05bcd81312a2885f824dac79e82c01a6e60c6c;hp=c5e14c94cea3b179770e2c00bd71cda32dc89359;hpb=a4ce2e60f783c9e71447edc03f20f937b8abf35a;p=tpg%2Facess2.git

diff --git a/Kernel/messages.c b/Kernel/messages.c
index c5e14c94..4765d65e 100644
--- a/Kernel/messages.c
+++ b/Kernel/messages.c
@@ -3,7 +3,7 @@
  * messages.c
  */
 #include <acess.h>
-#include <proc.h>
+#include <threads.h>
 #include <errno.h>
 
 // === CODE ===
@@ -34,10 +34,13 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 	if(!thread) {	return -1;	}
 	
 	// Get Spinlock
-	LOCK( &thread->IsLocked );
+	SHORTLOCK( &thread->IsLocked );
 	
 	// Check if thread is still alive
-	if(thread->Status == THREAD_STAT_DEAD)	return -1;
+	if(thread->Status == THREAD_STAT_DEAD) {
+		SHORTREL( &thread->IsLocked );
+		return -1;
+	}
 	
 	// Create message
 	msg = malloc( sizeof(tMsg)+Length );
@@ -55,7 +58,7 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 		thread->LastMessage = msg;
 	}
 	
-	RELEASE(&thread->IsLocked);
+	SHORTREL(&thread->IsLocked);
 	
 	Threads_Wake( thread );
 	
@@ -72,7 +75,7 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 {
 	 int	ret;
-	void *tmp;
+	void	*tmp;
 	tThread	*cur = Proc_GetCurThread();
 	
 	// Check if queue has any items
@@ -80,7 +83,7 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 		return 0;
 	}
 
-	LOCK( &cur->IsLocked );
+	SHORTLOCK( &cur->IsLocked );
 	
 	if(Source)
 		*Source = cur->Messages->Source;
@@ -88,21 +91,30 @@ int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 	// Get message length
 	if( !Buffer ) {
 		ret = cur->Messages->Length;
-		RELEASE( &cur->IsLocked );
+		SHORTREL( &cur->IsLocked );
 		return ret;
 	}
 	
 	// Get message
 	if(Buffer != GETMSG_IGNORE)
+	{
+		if( !CheckMem( Buffer, cur->Messages->Length ) )
+		{
+			*Err = -EINVAL;
+			SHORTREL( &cur->IsLocked );
+			return -1;
+		}
 		memcpy(Buffer, cur->Messages->Data, cur->Messages->Length);
+	}
 	ret = cur->Messages->Length;
 	
 	// Remove from list
-	tmp = cur->Messages->Next;
-	free( (void*)cur->Messages );
-	cur->Messages = tmp;
+	tmp = cur->Messages;
+	cur->Messages = cur->Messages->Next;
+	
+	SHORTREL( &cur->IsLocked );
 	
-	RELEASE( &cur->IsLocked );
+	free(tmp);	// Free outside of lock
 	
 	return ret;
 }