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

kernel: Use BStackOrHeapArray in fd & port vector I/O syscalls.

Browse Source 
The socket syscall needs to still use the heap. Also add a comment
around get_iovecs_from_user() indicating what callers must do.
This commit is contained in:
Augustin Cavalier
2024-06-25 21:33:20 -04:00
parent 20ac27def6
commit 8e56b86bdd
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/iovec_support.h
+7 -12
View File
@@ -41,36 +41,31 @@ generic_memcpy(generic_addr_t dest, bool destPhysical, generic_addr_t src, bool
#ifdef IS_USER_ADDRESS
/*!
* Copies an array of `iovec`s from userland.
* Callers must verify vecCount <= IOV_MAX and supply their own vecs buffer.
*/
static inline status_t
get_iovecs_from_user(const iovec* userVecs, size_t vecCount, iovec*& vecs,
get_iovecs_from_user(const iovec* userVecs, size_t vecCount, iovec* vecs,
bool permitNull = false)
{
// prevent integer overflow
if (vecCount > IOV_MAX || vecCount == 0)
if (vecCount == 0)
return B_BAD_VALUE;
if (!IS_USER_ADDRESS(userVecs))
return B_BAD_ADDRESS;
vecs = (iovec*)malloc(sizeof(iovec) * vecCount);
if (vecs == NULL)
return B_NO_MEMORY;
if (user_memcpy(vecs, userVecs, sizeof(iovec) * vecCount) != B_OK) {
free(vecs);
if (user_memcpy(vecs, userVecs, sizeof(iovec) * vecCount) != B_OK)
return B_BAD_ADDRESS;
}
size_t total = 0;
for (size_t i = 0; i < vecCount; i++) {
if (permitNull && vecs[i].iov_base == NULL)
continue;
if (!is_user_address_range(vecs[i].iov_base, vecs[i].iov_len)) {
free(vecs);
return B_BAD_ADDRESS;
}
if (vecs[i].iov_len > SSIZE_MAX || total > (SSIZE_MAX - vecs[i].iov_len)) {
free(vecs);
return B_BAD_VALUE;
}
total += vecs[i].iov_len;