svn commit: r293627 - head/sys/compat/linux

Dmitry Chagin dchagin at FreeBSD.org
Sun Jan 10 07:36:44 UTC 2016


Author: dchagin
Date: Sun Jan 10 07:36:43 2016
New Revision: 293627
URL: https://svnweb.freebsd.org/changeset/base/293627

Log:
  Unlock process lock when return error from getrobustlist call and add
  an forgotten dtrace probe when return the same error.
  
  MFC after:	3 days
  XMFC with:	r292743

Modified:
  head/sys/compat/linux/linux_futex.c

Modified: head/sys/compat/linux/linux_futex.c
==============================================================================
--- head/sys/compat/linux/linux_futex.c	Sun Jan 10 06:43:43 2016	(r293626)
+++ head/sys/compat/linux/linux_futex.c	Sun Jan 10 07:36:43 2016	(r293627)
@@ -1099,8 +1099,12 @@ linux_get_robust_list(struct thread *td,
 			    ESRCH);
 			return (ESRCH);
 		}
-		if (SV_PROC_ABI(td2->td_proc) != SV_ABI_LINUX)
+		if (SV_PROC_ABI(td2->td_proc) != SV_ABI_LINUX) {
+			LIN_SDT_PROBE1(futex, linux_get_robust_list, return,
+			    EPERM);
+			PROC_UNLOCK(td2->td_proc);
 			return (EPERM);
+		}
 
 		em = em_find(td2);
 		KASSERT(em != NULL, ("get_robust_list: emuldata notfound.\n"));


More information about the svn-src-all mailing list