svn commit: r315470 - in stable/11/sys: kern sys

[Konstantin Belousov]

Author: kib
Date: Sat Mar 18 03:49:50 2017
New Revision: 315470
URL: https://svnweb.freebsd.org/changeset/base/315470

Log:
  MFC r315155:
  Ktracing kevent(2) calls with unusual arguments might leads to an
  overly large allocation requests.
  
  PR:	217435
  
  MFC r315237:
  Hide kev_iovlen() definition under #ifdef KTRACE.

Modified:
  stable/11/sys/kern/kern_event.c
  stable/11/sys/kern/kern_ktrace.c
  stable/11/sys/sys/ktrace.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_event.c
==============================================================================
--- stable/11/sys/kern/kern_event.c	Sat Mar 18 01:37:20 2017	(r315469)
+++ stable/11/sys/kern/kern_event.c	Sat Mar 18 03:49:50 2017	(r315470)
@@ -859,6 +859,17 @@ kern_kqueue(struct thread *td, int flags
 	return (0);
 }
 
+#ifdef KTRACE
+static size_t
+kev_iovlen(int n, u_int kgio)
+{
+
+	if (n < 0 || n >= kgio / sizeof(struct kevent))
+		return (kgio);
+	return (n * sizeof(struct kevent));
+}
+#endif
+
 #ifndef _SYS_SYSPROTO_H_
 struct kevent_args {
 	int	fd;
@@ -882,6 +893,7 @@ sys_kevent(struct thread *td, struct kev
 	struct iovec ktriov;
 	struct uio *ktruioin = NULL;
 	struct uio *ktruioout = NULL;
+	u_int kgio;
 #endif
 
 	if (uap->timeout != NULL) {
@@ -894,13 +906,15 @@ sys_kevent(struct thread *td, struct kev
 
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_GENIO)) {
+		kgio = ktr_geniosize;
 		ktriov.iov_base = uap->changelist;
-		ktriov.iov_len = uap->nchanges * sizeof(struct kevent);
+		ktriov.iov_len = kev_iovlen(uap->nchanges, kgio);
 		ktruio = (struct uio){ .uio_iov = &ktriov, .uio_iovcnt = 1,
 		    .uio_segflg = UIO_USERSPACE, .uio_rw = UIO_READ,
 		    .uio_td = td };
 		ktruioin = cloneuio(&ktruio);
 		ktriov.iov_base = uap->eventlist;
+		ktriov.iov_len = kev_iovlen(uap->nevents, kgio);
 		ktriov.iov_len = uap->nevents * sizeof(struct kevent);
 		ktruioout = cloneuio(&ktruio);
 	}
@@ -911,9 +925,9 @@ sys_kevent(struct thread *td, struct kev
 
 #ifdef KTRACE
 	if (ktruioin != NULL) {
-		ktruioin->uio_resid = uap->nchanges * sizeof(struct kevent);
+		ktruioin->uio_resid = kev_iovlen(uap->nchanges, kgio);
 		ktrgenio(uap->fd, UIO_WRITE, ktruioin, 0);
-		ktruioout->uio_resid = td->td_retval[0] * sizeof(struct kevent);
+		ktruioout->uio_resid = kev_iovlen(td->td_retval[0], kgio);
 		ktrgenio(uap->fd, UIO_READ, ktruioout, error);
 	}
 #endif

Modified: stable/11/sys/kern/kern_ktrace.c
==============================================================================
--- stable/11/sys/kern/kern_ktrace.c	Sat Mar 18 01:37:20 2017	(r315469)
+++ stable/11/sys/kern/kern_ktrace.c	Sat Mar 18 03:49:50 2017	(r315470)
@@ -132,7 +132,7 @@ static SYSCTL_NODE(_kern, OID_AUTO, ktra
 static u_int ktr_requestpool = KTRACE_REQUEST_POOL;
 TUNABLE_INT("kern.ktrace.request_pool", &ktr_requestpool);
 
-static u_int ktr_geniosize = PAGE_SIZE;
+u_int ktr_geniosize = PAGE_SIZE;
 SYSCTL_UINT(_kern_ktrace, OID_AUTO, genio_size, CTLFLAG_RWTUN, &ktr_geniosize,
     0, "Maximum size of genio event payload");
 

Modified: stable/11/sys/sys/ktrace.h
==============================================================================
--- stable/11/sys/sys/ktrace.h	Sat Mar 18 01:37:20 2017	(r315469)
+++ stable/11/sys/sys/ktrace.h	Sat Mar 18 03:49:50 2017	(r315470)
@@ -276,7 +276,7 @@ void	ktrcapfail(enum ktr_cap_fail_type, 
 	ktrstruct("sockaddr", (s), ((struct sockaddr *)(s))->sa_len)
 #define ktrstat(s) \
 	ktrstruct("stat", (s), sizeof(struct stat))
-
+extern u_int ktr_geniosize;
 #else
 
 #include <sys/cdefs.h>