svn commit: r315647 - head/lib/libkvm

Ngie Cooper ngie at FreeBSD.org
Mon Mar 20 18:28:24 UTC 2017


Author: ngie
Date: Mon Mar 20 18:28:22 2017
New Revision: 315647
URL: https://svnweb.freebsd.org/changeset/base/315647

Log:
  Handle kd == NULL gracefully with kvm_close(3)
  
  Don't segfault in kvm_close(3) if provided a NULL pointer. Instead, return
  -1 and set errno to EINVAL.
  
  Document this new behavior explicitly.
  
  MFC after:	1 week
  Reviewed by:	vangyzen
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	D10065

Modified:
  head/lib/libkvm/kvm.c
  head/lib/libkvm/kvm_open.3

Modified: head/lib/libkvm/kvm.c
==============================================================================
--- head/lib/libkvm/kvm.c	Mon Mar 20 18:15:36 2017	(r315646)
+++ head/lib/libkvm/kvm.c	Mon Mar 20 18:28:22 2017	(r315647)
@@ -272,6 +272,10 @@ kvm_close(kvm_t *kd)
 {
 	int error = 0;
 
+	if (kd == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
 	if (kd->vmst != NULL)
 		kd->arch->ka_freevtop(kd);
 	if (kd->pmfd >= 0)

Modified: head/lib/libkvm/kvm_open.3
==============================================================================
--- head/lib/libkvm/kvm_open.3	Mon Mar 20 18:15:36 2017	(r315646)
+++ head/lib/libkvm/kvm_open.3	Mon Mar 20 18:28:22 2017	(r315647)
@@ -32,7 +32,7 @@
 .\"     @(#)kvm_open.3	8.3 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\"
-.Dd March 19, 2017
+.Dd March 20, 2017
 .Dt KVM_OPEN 3
 .Os
 .Sh NAME
@@ -227,10 +227,29 @@ and
 write the error message into
 .Fa errbuf .
 .Pp
+.Rv -std kvm_close
+.Sh ERRORS
 The
 .Fn kvm_close
-function returns 0 on success and -1 on failure.
+function may fail and set the global variable
+.Va errno
+for any of the errors specified for
+.Xr close 2 .
+.Pp
+The
+.Fn kvm_close
+function may also fail and set
+.Va errno
+if:
+.Bl -tag -width Er
+.It Bq Er EINVAL
+The value passed via
+.Fa kd
+was
+.Dv NULL .
+.El
 .Sh SEE ALSO
+.Xr close 2 ,
 .Xr open 2 ,
 .Xr kvm 3 ,
 .Xr kvm_getargv 3 ,


More information about the svn-src-head mailing list