i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* If the receving buffer if bigger than the message, truncate the length copied

Browse Source 
to the one of the message
* Fix comparison
* Clean up


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27415 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Salvatore Benedetto
2008-09-11 14:42:13 +00:00
parent 43209917de
commit b9b04b6c32
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/posix/xsi_message_queue.cpp
+9 -5
View File
@@ -78,6 +78,9 @@ struct queued_message : DoublyLinkedListLinkImpl<queued_message> {
status_t copy_to_user_buffer(void *_message, ssize_t _length) status_t copy_to_user_buffer(void *_message, ssize_t _length)
{ {
if (_length > length)
_length = length;
if (user_memcpy(_message, &type, sizeof(long)) != B_OK if (user_memcpy(_message, &type, sizeof(long)) != B_OK
|| user_memcpy((void *)((char *)_message + sizeof(long)), message, || user_memcpy((void *)((char *)_message + sizeof(long)), message,
_length) != B_OK) _length) != B_OK)
@@ -788,7 +791,7 @@ _user_xsi_msgrcv(int messageQueueID, void *messagePointer,
return ENOMSG; return ENOMSG;
} else { } else {
// Message received correctly (so far) // Message received correctly (so far)
if ((ssize_t)messageSize > message->length if ((ssize_t)messageSize < message->length
&& !(messageFlags & MSG_NOERROR)) { && !(messageFlags & MSG_NOERROR)) {
TRACE_ERROR(("xsi_msgrcv: message too big!\n")); TRACE_ERROR(("xsi_msgrcv: message too big!\n"));
// Put the message back inside. Since we hold the // Put the message back inside. Since we hold the
@@ -855,6 +858,7 @@ _user_xsi_msgsnd(int messageQueueID, const void *messagePointer,
} }
bool notSent = true; bool notSent = true;
status_t result = B_OK;
while (notSent) { while (notSent) {
bool goToSleep = messageQueue->Insert(message); bool goToSleep = messageQueue->Insert(message);
@@ -867,8 +871,7 @@ _user_xsi_msgsnd(int messageQueueID, const void *messagePointer,
uint32 sequenceNumber = messageQueue->SequenceNumber(); uint32 sequenceNumber = messageQueue->SequenceNumber();
TRACE(("xsi_msgsnd: thread %d going to sleep\n", (int)thread->id)); TRACE(("xsi_msgsnd: thread %d going to sleep\n", (int)thread->id));
status_t result result = messageQueue->BlockAndUnlock(thread, &messageQueueLocker);
= messageQueue->BlockAndUnlock(thread, &messageQueueLocker);
TRACE(("xsi_msgsnd: thread %d back to life\n", (int)thread->id)); TRACE(("xsi_msgsnd: thread %d back to life\n", (int)thread->id));
messageQueueHashLocker.Lock(); messageQueueHashLocker.Lock();
@@ -895,7 +898,8 @@ _user_xsi_msgsnd(int messageQueueID, const void *messagePointer,
} else if (goToSleep) { } else if (goToSleep) {
// We did not send the message and we can't wait // We did not send the message and we can't wait
delete message; delete message;
return EAGAIN; notSent = false;
result = EAGAIN;
} else { } else {
// Message delivered correctly // Message delivered correctly
TRACE(("xsi_msgsnd: message sent correctly\n")); TRACE(("xsi_msgsnd: message sent correctly\n"));
@@ -903,5 +907,5 @@ _user_xsi_msgsnd(int messageQueueID, const void *messagePointer,
} }
} }
return B_OK; return result;
} }