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

use UserBuffer in list_{device,domain}_interfaces

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20503 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Hugo Santos
2007-04-01 17:49:41 +00:00
parent 5333836f71
commit 409b1fc051
2 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/stack/domains.cpp
+7 -12
View File
@@ -9,6 +9,7 @@
#include "domains.h" #include "domains.h"
#include "interfaces.h" #include "interfaces.h"
#include "utility.h"
#include <KernelExport.h> #include <KernelExport.h>
@@ -99,12 +100,11 @@ count_domain_interfaces()
returned. returned.
*/ */
status_t status_t
list_domain_interfaces(void *buffer, size_t *_bufferSize) list_domain_interfaces(void *_buffer, size_t *bufferSize)
{ {
BenaphoreLocker locker(sDomainLock); BenaphoreLocker locker(sDomainLock);
uint8 *current = (uint8 *)buffer; UserBuffer buffer(_buffer, *bufferSize);
const uint8 *bufferEnd = current + (*_bufferSize);
net_domain_private *domain = NULL; net_domain_private *domain = NULL;
while (true) { while (true) {
@@ -119,10 +119,6 @@ list_domain_interfaces(void *buffer, size_t *_bufferSize)
if (interface == NULL) if (interface == NULL)
break; break;
size_t size = IF_NAMESIZE + (interface->address ? interface->address->sa_len : 2);
if ((current + size) > bufferEnd)
return ENOBUFS;
ifreq request; ifreq request;
strlcpy(request.ifr_name, interface->name, IF_NAMESIZE); strlcpy(request.ifr_name, interface->name, IF_NAMESIZE);
if (interface->address != NULL) if (interface->address != NULL)
@@ -133,14 +129,13 @@ list_domain_interfaces(void *buffer, size_t *_bufferSize)
request.ifr_addr.sa_family = AF_UNSPEC; request.ifr_addr.sa_family = AF_UNSPEC;
} }
if (user_memcpy(current, &request, size) < B_OK) if (buffer.Copy(&request, IF_NAMESIZE
return B_BAD_ADDRESS; + request.ifr_addr.sa_len) == NULL)
return buffer.Status();
current += size;
} }
} }
*_bufferSize = current - (uint8 *)buffer; *bufferSize = buffer.ConsumedAmount();
return B_OK; return B_OK;
} }
src/add-ons/kernel/network/stack/interfaces.cpp
+7 -12
View File
@@ -10,6 +10,7 @@
#include "domains.h" #include "domains.h"
#include "interfaces.h" #include "interfaces.h"
#include "stack_private.h" #include "stack_private.h"
#include "utility.h"
#include <net_device.h> #include <net_device.h>
@@ -258,12 +259,11 @@ count_device_interfaces()
returned. returned.
*/ */
status_t status_t
list_device_interfaces(void *buffer, size_t *_bufferSize) list_device_interfaces(void *_buffer, size_t *bufferSize)
{ {
BenaphoreLocker locker(sInterfaceLock); BenaphoreLocker locker(sInterfaceLock);
uint8 *current = (uint8 *)buffer; UserBuffer buffer(_buffer, *bufferSize);
const uint8 *bufferEnd = current + (*_bufferSize);
net_device_interface *interface = NULL; net_device_interface *interface = NULL;
while (true) { while (true) {
@@ -276,17 +276,12 @@ list_device_interfaces(void *buffer, size_t *_bufferSize)
strlcpy(request.ifr_name, interface->name, IF_NAMESIZE); strlcpy(request.ifr_name, interface->name, IF_NAMESIZE);
get_device_interface_address(interface, &request.ifr_addr); get_device_interface_address(interface, &request.ifr_addr);
size_t size = IF_NAMESIZE + request.ifr_addr.sa_len; if (buffer.Copy(&request, IF_NAMESIZE
if ((current + size) > bufferEnd) + request.ifr_addr.sa_len) == NULL)
return ENOBUFS; return buffer.Status();
if (user_memcpy(current, &request, size) < B_OK)
return B_BAD_ADDRESS;
current += size;
} }
*_bufferSize = current - (uint8 *)buffer;; *bufferSize = buffer.ConsumedAmount();
return B_OK; return B_OK;
} }