diff options
author | ngie <ngie@FreeBSD.org> | 2017-03-27 18:22:33 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2017-03-27 18:22:33 +0000 |
commit | dbb0c0010ec41428ba46740d8b2a5669ea05f1b3 (patch) | |
tree | 83dc67533c6fd140c3e7d19ac268421f6c0c0759 | |
parent | 5ae64e785110cdeba9bef6771bbccaf30b04126b (diff) | |
download | FreeBSD-src-dbb0c0010ec41428ba46740d8b2a5669ea05f1b3.zip FreeBSD-src-dbb0c0010ec41428ba46740d8b2a5669ea05f1b3.tar.gz |
MFC r315595,r315601,r315603,r315647:
r315595:
Remove a commented out line before kvm_getprocs(3)
The commented out return value for kvm_getprocs(3) was misleading -- the
uncommented line is correct.
No content change
r315601:
kvm_open2(3): remove '*' when describing addr argument for `resolver`
As noted by vangyzen, with a similar issue in D10022, the pointer portion of
the .Fa macro call is unnecessary, so remove the '*'.
r315603:
kvm_close(3): return `error` instead of blindly returning `0`
`error` is the accumulated error from previous close(2) calls.
This bug has been present since the libcall's import from 4.4BSD
Lite (r1573).
Noticed by: vangyzen (D10022)
Relnotes: yes
r315647:
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.
-rw-r--r-- | lib/libkvm/kvm.c | 6 | ||||
-rw-r--r-- | lib/libkvm/kvm_getprocs.3 | 1 | ||||
-rw-r--r-- | lib/libkvm/kvm_open.3 | 25 |
3 files changed, 27 insertions, 5 deletions
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index 0de0dd6..2f95a20 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -534,6 +534,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) @@ -552,7 +556,7 @@ kvm_close(kvm_t *kd) free((void *)kd->argv); free((void *)kd); - return (0); + return (error); } /* diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3 index 013da08..eb2af98 100644 --- a/lib/libkvm/kvm_getprocs.3 +++ b/lib/libkvm/kvm_getprocs.3 @@ -47,7 +47,6 @@ .In sys/param.h .In sys/sysctl.h .In sys/user.h -.\" .Fa kvm_t *kd .Ft struct kinfo_proc * .Fn kvm_getprocs "kvm_t *kd" "int op" "int arg" "int *cnt" .Ft char ** diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3 index 6942239..b573488 100644 --- a/lib/libkvm/kvm_open.3 +++ b/lib/libkvm/kvm_open.3 @@ -32,7 +32,7 @@ .\" @(#)kvm_open.3 8.3 (Berkeley) 4/19/94 .\" $FreeBSD$ .\" -.Dd November 27, 2015 +.Dd March 20, 2017 .Dt KVM_OPEN 3 .Os .Sh NAME @@ -196,7 +196,7 @@ function is called, specifies the requested symbol name. If the function is able to resolve the name to an address, the address should be set in -.Fa *addr +.Fa addr and the function should return zero. If the function is not able to resolve the name to an address, it should return a non-zero value. @@ -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 , |