svn commit: r194375 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal

[Dmitry Chagin]

Author: dchagin
Date: Wed Jun 17 16:56:21 2009
New Revision: 194375
URL: http://svn.freebsd.org/changeset/base/194375

Log:
  MFC r194203:
  
  Unlock process lock when return error from getrobustlist call.
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_futex.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)

Modified: stable/7/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/7/sys/compat/linux/linux_futex.c	Wed Jun 17 16:34:40 2009	(r194374)
+++ stable/7/sys/compat/linux/linux_futex.c	Wed Jun 17 16:56:21 2009	(r194375)
@@ -707,8 +707,10 @@ linux_get_robust_list(struct thread *td,
 		/* XXX: ptrace? */
 		if (priv_check(td, PRIV_CRED_SETUID) || 
 		    priv_check(td, PRIV_CRED_SETEUID) ||
-		    p_candebug(td, p))
+		    p_candebug(td, p)) {
+			PROC_UNLOCK(p);
 			return (EPERM);
+		}
 		head = em->robust_futexes;
 		
 		PROC_UNLOCK(p);