Author: glebius
Date: Mon Jan 11 21:46:37 2016
New Revision: 293703
URL: https://svnweb.freebsd.org/changeset/base/293703
Log:
Merge from head r292743, r293627 by dchagin:
------------------------------------------------------------------------
r292743 | dchagin | 2015-12-26 01:04:47 -0800 (сб, 26 дек. 2015) | 5 lines
Do not allow access to emuldata for non Linux processes.
------------------------------------------------------------------------
r293627 | dchagin | 2016-01-09 23:36:43 -0800 (сб, 09 янв. 2016) | 6 lines
Unlock process lock when return error from getrobustlist call and add
an forgotten dtrace probe when return the same error.
Modified:
stable/10/sys/compat/linux/linux_futex.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/10/sys/compat/linux/linux_futex.c Mon Jan 11 21:29:36 2016
(r293702)
+++ stable/10/sys/compat/linux/linux_futex.c Mon Jan 11 21:46:37 2016
(r293703)
@@ -1100,6 +1100,12 @@ linux_get_robust_list(struct thread *td,
ESRCH);
return (ESRCH);
}
+ 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"));
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
