git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to reduce the ability for a fork bomb to fault the kernel
[tpg/acess2.git]
/
Kernel
/
messages.c
diff --git
a/Kernel/messages.c
b/Kernel/messages.c
index
93cf6ca
..
4765d65
100644
(file)
--- a/
Kernel/messages.c
+++ b/
Kernel/messages.c
@@
-2,8
+2,8
@@
* AcessOS Microkernel Version
* messages.c
*/
* AcessOS Microkernel Version
* messages.c
*/
-#include <
common
.h>
-#include <
proc
.h>
+#include <
acess
.h>
+#include <
threads
.h>
#include <errno.h>
// === CODE ===
#include <errno.h>
// === CODE ===
@@
-12,6
+12,8
@@
* \brief Send an IPC message
* \param Err Pointer to the errno variable
* \param Dest Destination Thread
* \brief Send an IPC message
* \param Err Pointer to the errno variable
* \param Dest Destination Thread
+ * \param Length Length of the message
+ * \param Data Message data
*/
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
{
*/
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
{
@@
-32,10
+34,13
@@
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
if(!thread) { return -1; }
// Get Spinlock
if(!thread) { return -1; }
// Get Spinlock
- LOCK( &thread->IsLocked );
+
SHORT
LOCK( &thread->IsLocked );
// Check if thread is still alive
// 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 );
// Create message
msg = malloc( sizeof(tMsg)+Length );
@@
-53,7
+58,7
@@
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
thread->LastMessage = msg;
}
thread->LastMessage = msg;
}
-
RELEASE
(&thread->IsLocked);
+
SHORTREL
(&thread->IsLocked);
Threads_Wake( thread );
Threads_Wake( thread );
@@
-63,11
+68,14
@@
int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
/**
* \fn int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
* \brief Gets a message
/**
* \fn int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
* \brief Gets a message
+ * \param Err Pointer to \a errno
+ * \param Source Where to put the source TID
+ * \param Buffer Buffer to place the message data (set to NULL to just get message length)
*/
int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
{
int ret;
*/
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
tThread *cur = Proc_GetCurThread();
// Check if queue has any items
@@
-75,7
+83,7
@@
int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
return 0;
}
return 0;
}
- LOCK( &cur->IsLocked );
+
SHORT
LOCK( &cur->IsLocked );
if(Source)
*Source = cur->Messages->Source;
if(Source)
*Source = cur->Messages->Source;
@@
-83,21
+91,30
@@
int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
// Get message length
if( !Buffer ) {
ret = cur->Messages->Length;
// Get message length
if( !Buffer ) {
ret = cur->Messages->Length;
-
RELEASE
( &cur->IsLocked );
+
SHORTREL
( &cur->IsLocked );
return ret;
}
// Get message
if(Buffer != GETMSG_IGNORE)
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);
memcpy(Buffer, cur->Messages->Data, cur->Messages->Length);
+ }
ret = cur->Messages->Length;
// Remove from list
ret = cur->Messages->Length;
// Remove from list
- tmp = cur->Messages->Next;
- free(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;
}
return ret;
}
UCC
git Repository :: git.ucc.asn.au