d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use mallocarray(9) in CloudABI kernel code where possible.

Browse Source 
Submitted by:	pfg@
This commit is contained in:
ed 2018-01-07 22:38:45 +00:00
parent 339093aef3
commit fd459f1474
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/compat/cloudabi32/cloudabi32_sock.c
View File

@ -60,7 +60,7 @@ cloudabi32_sys_sock_recv(struct thread *td,
/* Convert iovecs to native format. */ /* Convert iovecs to native format. */
if (ri.ri_data_len > UIO_MAXIOV) if (ri.ri_data_len > UIO_MAXIOV)
return (EINVAL); return (EINVAL);
iov = malloc(ri.ri_data_len * sizeof(struct iovec), iov = mallocarray(ri.ri_data_len, sizeof(struct iovec),
M_SOCKET, M_WAITOK); M_SOCKET, M_WAITOK);
user_iov = TO_PTR(ri.ri_data); user_iov = TO_PTR(ri.ri_data);
for (i = 0; i < ri.ri_data_len; i++) { for (i = 0; i < ri.ri_data_len; i++) {
@ -104,7 +104,7 @@ cloudabi32_sys_sock_send(struct thread *td,
/* Convert iovecs to native format. */ /* Convert iovecs to native format. */
if (si.si_data_len > UIO_MAXIOV) if (si.si_data_len > UIO_MAXIOV)
return (EINVAL); return (EINVAL);
iov = malloc(si.si_data_len * sizeof(struct iovec), iov = mallocarray(si.si_data_len, sizeof(struct iovec),
M_SOCKET, M_WAITOK); M_SOCKET, M_WAITOK);
user_iov = TO_PTR(si.si_data); user_iov = TO_PTR(si.si_data);
for (i = 0; i < si.si_data_len; i++) { for (i = 0; i < si.si_data_len; i++) {

4
sys/compat/cloudabi64/cloudabi64_sock.c
View File

@ -60,7 +60,7 @@ cloudabi64_sys_sock_recv(struct thread *td,
/* Convert iovecs to native format. */ /* Convert iovecs to native format. */
if (ri.ri_data_len > UIO_MAXIOV) if (ri.ri_data_len > UIO_MAXIOV)
return (EINVAL); return (EINVAL);
iov = malloc(ri.ri_data_len * sizeof(struct iovec), iov = mallocarray(ri.ri_data_len, sizeof(struct iovec),
M_SOCKET, M_WAITOK); M_SOCKET, M_WAITOK);
user_iov = TO_PTR(ri.ri_data); user_iov = TO_PTR(ri.ri_data);
for (i = 0; i < ri.ri_data_len; i++) { for (i = 0; i < ri.ri_data_len; i++) {
@ -104,7 +104,7 @@ cloudabi64_sys_sock_send(struct thread *td,
/* Convert iovecs to native format. */ /* Convert iovecs to native format. */
if (si.si_data_len > UIO_MAXIOV) if (si.si_data_len > UIO_MAXIOV)
return (EINVAL); return (EINVAL);
iov = malloc(si.si_data_len * sizeof(struct iovec), iov = mallocarray(si.si_data_len, sizeof(struct iovec),
M_SOCKET, M_WAITOK); M_SOCKET, M_WAITOK);
user_iov = TO_PTR(si.si_data); user_iov = TO_PTR(si.si_data);
for (i = 0; i < si.si_data_len; i++) { for (i = 0; i < si.si_data_len; i++) {