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

* return_address() now accepts a NULL address pointer without returning an error.

Browse Source 
* NET_STACK_GET_COOKIE copied the wrong data, always returned the socket instead of
  the cookie (which is NULL at this point, anyway). Note that this mechanism is only
  temporary anyway, as it's highly unsafe.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19661 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-12-31 15:42:19 +00:00
parent e19a0bfa1b
commit 8652d8f33a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/stack/kernel_stack.cpp
+8 -3
View File
@@ -55,8 +55,13 @@ return_address(ArgType &args, void *data)
{
sockaddr_storage *target;
if (user_memcpy(&target, &((ArgType *)data)->address, sizeof(void *)) < B_OK
|| user_memcpy(&((ArgType *)data)->address_length, &args.address_length, sizeof(socklen_t)) < B_OK
if (user_memcpy(&target, &((ArgType *)data)->address, sizeof(void *)) < B_OK)
return B_BAD_ADDRESS;
if (target == NULL)
return B_OK;
if (user_memcpy(&((ArgType *)data)->address_length, &args.address_length, sizeof(socklen_t)) < B_OK
|| user_memcpy(target, args.address, args.address_length) < B_OK)
return B_BAD_ADDRESS;
@@ -260,7 +265,7 @@ net_stack_control(void *_cookie, uint32 op, void *data, size_t length)
// This is needed by accept() call, allowing libnet.so accept() to pass back
// in NET_STACK_ACCEPT opcode the cookie (aka the net_stack_cookie!)
// of the file descriptor to use for the new accepted socket
return user_memcpy(data, cookie, sizeof(void *));
return user_memcpy(data, &cookie, sizeof(void *));
case NET_STACK_GET_NEXT_STAT:
{