svn commit: r327684 - in head/sys/compat: cloudabi32 cloudabi64

[Ed Schouten]

Author: ed
Date: Sun Jan  7 22:38:45 2018
New Revision: 327684
URL: https://svnweb.freebsd.org/changeset/base/327684

Log:
  Use mallocarray(9) in CloudABI kernel code where possible.
  
  Submitted by:	pfg@

Modified:
  head/sys/compat/cloudabi32/cloudabi32_sock.c
  head/sys/compat/cloudabi64/cloudabi64_sock.c

Modified: head/sys/compat/cloudabi32/cloudabi32_sock.c
==============================================================================
--- head/sys/compat/cloudabi32/cloudabi32_sock.c	Sun Jan  7 22:21:07 2018	(r327683)
+++ head/sys/compat/cloudabi32/cloudabi32_sock.c	Sun Jan  7 22:38:45 2018	(r327684)
@@ -60,7 +60,7 @@ cloudabi32_sys_sock_recv(struct thread *td,
 	/* Convert iovecs to native format. */
 	if (ri.ri_data_len > UIO_MAXIOV)
 		return (EINVAL);
-	iov = malloc(ri.ri_data_len * sizeof(struct iovec),
+	iov = mallocarray(ri.ri_data_len, sizeof(struct iovec),
 	    M_SOCKET, M_WAITOK);
 	user_iov = TO_PTR(ri.ri_data);
 	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. */
 	if (si.si_data_len > UIO_MAXIOV)
 		return (EINVAL);
-	iov = malloc(si.si_data_len * sizeof(struct iovec),
+	iov = mallocarray(si.si_data_len, sizeof(struct iovec),
 	    M_SOCKET, M_WAITOK);
 	user_iov = TO_PTR(si.si_data);
 	for (i = 0; i < si.si_data_len; i++) {

Modified: head/sys/compat/cloudabi64/cloudabi64_sock.c
==============================================================================
--- head/sys/compat/cloudabi64/cloudabi64_sock.c	Sun Jan  7 22:21:07 2018	(r327683)
+++ head/sys/compat/cloudabi64/cloudabi64_sock.c	Sun Jan  7 22:38:45 2018	(r327684)
@@ -60,7 +60,7 @@ cloudabi64_sys_sock_recv(struct thread *td,
 	/* Convert iovecs to native format. */
 	if (ri.ri_data_len > UIO_MAXIOV)
 		return (EINVAL);
-	iov = malloc(ri.ri_data_len * sizeof(struct iovec),
+	iov = mallocarray(ri.ri_data_len, sizeof(struct iovec),
 	    M_SOCKET, M_WAITOK);
 	user_iov = TO_PTR(ri.ri_data);
 	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. */
 	if (si.si_data_len > UIO_MAXIOV)
 		return (EINVAL);
-	iov = malloc(si.si_data_len * sizeof(struct iovec),
+	iov = mallocarray(si.si_data_len, sizeof(struct iovec),
 	    M_SOCKET, M_WAITOK);
 	user_iov = TO_PTR(si.si_data);
 	for (i = 0; i < si.si_data_len; i++) {