[Glibc-bsd-commits] r3458 - trunk/kfreebsd-8/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2011-06-17 08:00:49 +0000 (Fri, 17 Jun 2011)
New Revision: 3458

Modified:
   trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff
Log:
replace by version applied by upstream



Modified: trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff	2011-06-16 12:22:23 UTC (rev 3457)
+++ trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff	2011-06-17 08:00:49 UTC (rev 3458)
@@ -1,26 +1,36 @@
 
 See #630104
 Submitted upstream as http://www.freebsd.org/cgi/query-pr.cgi?pr=157871
+Fixed in HEAD in svn r223182.
 
-
 --- a/sys/compat/linprocfs/linprocfs.c
 +++ b/sys/compat/linprocfs/linprocfs.c
-@@ -1044,6 +1044,10 @@
+@@ -1049,6 +1049,15 @@
  		PROC_UNLOCK(p);
  		return (ret);
  	}
-+	if (p->p_flag & P_KTHREAD) {
++
++	/*
++	 * Mimic linux behavior and pass only processes with usermode
++	 * address space as valid.  Return zero silently otherwize.
++	 */
++	if (p->p_vmspace == &vmspace0) {
 +		PROC_UNLOCK(p);
 +		return (0);
 +	}
  	if (p->p_args != NULL) {
  		sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length);
  		PROC_UNLOCK(p);
-@@ -1068,6 +1072,10 @@
+@@ -1073,6 +1082,15 @@
  		PROC_UNLOCK(p);
  		return (ret);
  	}
-+	if (p->p_flag & P_KTHREAD) {
++
++	/*
++	 * Mimic linux behavior and pass only processes with usermode
++	 * address space as valid.  Return zero silently otherwize.
++	 */
++	if (p->p_vmspace == &vmspace0) {
 +		PROC_UNLOCK(p);
 +		return (0);
 +	}