svn commit: r231550 - stable/9/lib/libkvm

[Mikolaj Golub]

Author: trociny
Date: Sun Feb 12 07:52:14 2012
New Revision: 231550
URL: http://svn.freebsd.org/changeset/base/231550

Log:
  MFC r230873:
  
  Try to avoid ambiguity when sysctl returns ENOMEM additionally
  checking the returned oldlen: when ENOMEM is due to the supplied
  buffer being too short the return oldlen is equal to buffer size.
  
  Without this additional check kvm_getprocs() gets stuck in loop if the
  returned ENOMEM was due the exceeded memorylocked limit. This is
  easily can be observed running `limits -l 1k top'.
  
  Submitted by:	Andrey Zonov <andrey zonov org>

Modified:
  stable/9/lib/libkvm/kvm_proc.c
Directory Properties:
  stable/9/lib/libkvm/   (props changed)

Modified: stable/9/lib/libkvm/kvm_proc.c
==============================================================================
--- stable/9/lib/libkvm/kvm_proc.c	Sun Feb 12 07:45:48 2012	(r231549)
+++ stable/9/lib/libkvm/kvm_proc.c	Sun Feb 12 07:52:14 2012	(r231550)
@@ -474,7 +474,7 @@ struct kinfo_proc *
 kvm_getprocs(kvm_t *kd, int op, int arg, int *cnt)
 {
 	int mib[4], st, nprocs;
-	size_t size;
+	size_t size, osize;
 	int temp_op;
 
 	if (kd->procbase != 0) {
@@ -524,10 +524,11 @@ kvm_getprocs(kvm_t *kd, int op, int arg,
 			    _kvm_realloc(kd, kd->procbase, size);
 			if (kd->procbase == 0)
 				return (0);
+			osize = size;
 			st = sysctl(mib, temp_op == KERN_PROC_ALL ||
 			    temp_op == KERN_PROC_PROC ? 3 : 4,
 			    kd->procbase, &size, NULL, 0);
-		} while (st == -1 && errno == ENOMEM);
+		} while (st == -1 && errno == ENOMEM && size == osize);
 		if (st == -1) {
 			_kvm_syserr(kd, kd->program, "kvm_getprocs");
 			return (0);