Deleted Added
full compact
kern_context.c (209613) kern_context.c (218327)
1/*-
2 * Copyright (c) 2002 Daniel M. Eischen <deischen@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 Daniel M. Eischen <deischen@freebsd.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/kern/kern_context.c 209613 2010-06-30 18:03:42Z jhb $");
28__FBSDID("$FreeBSD: head/sys/kern/kern_context.c 218327 2011-02-05 15:10:27Z kib $");
29
30#include <sys/param.h>
31#include <sys/kernel.h>
32#include <sys/lock.h>
33#include <sys/mutex.h>
34#include <sys/proc.h>
35#include <sys/syscallsubr.h>
36#include <sys/sysent.h>

--- 30 unchanged lines hidden (view full) ---

67
68 if (uap->ucp == NULL)
69 ret = EINVAL;
70 else {
71 get_mcontext(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
72 PROC_LOCK(td->td_proc);
73 uc.uc_sigmask = td->td_sigmask;
74 PROC_UNLOCK(td->td_proc);
29
30#include <sys/param.h>
31#include <sys/kernel.h>
32#include <sys/lock.h>
33#include <sys/mutex.h>
34#include <sys/proc.h>
35#include <sys/syscallsubr.h>
36#include <sys/sysent.h>

--- 30 unchanged lines hidden (view full) ---

67
68 if (uap->ucp == NULL)
69 ret = EINVAL;
70 else {
71 get_mcontext(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
72 PROC_LOCK(td->td_proc);
73 uc.uc_sigmask = td->td_sigmask;
74 PROC_UNLOCK(td->td_proc);
75 bzero(uc.__spare__, sizeof(uc.__spare__));
75 ret = copyout(&uc, uap->ucp, UC_COPY_SIZE);
76 }
77 return (ret);
78}
79
80int
81setcontext(struct thread *td, struct setcontext_args *uap)
82{

--- 20 unchanged lines hidden (view full) ---

103{
104 ucontext_t uc;
105 int ret;
106
107 if (uap->oucp == NULL || uap->ucp == NULL)
108 ret = EINVAL;
109 else {
110 get_mcontext(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
76 ret = copyout(&uc, uap->ucp, UC_COPY_SIZE);
77 }
78 return (ret);
79}
80
81int
82setcontext(struct thread *td, struct setcontext_args *uap)
83{

--- 20 unchanged lines hidden (view full) ---

104{
105 ucontext_t uc;
106 int ret;
107
108 if (uap->oucp == NULL || uap->ucp == NULL)
109 ret = EINVAL;
110 else {
111 get_mcontext(td, &uc.uc_mcontext, GET_MC_CLEAR_RET);
112 bzero(uc.__spare__, sizeof(uc.__spare__));
111 PROC_LOCK(td->td_proc);
112 uc.uc_sigmask = td->td_sigmask;
113 PROC_UNLOCK(td->td_proc);
114 ret = copyout(&uc, uap->oucp, UC_COPY_SIZE);
115 if (ret == 0) {
116 ret = copyin(uap->ucp, &uc, UC_COPY_SIZE);
117 if (ret == 0) {
118 ret = set_mcontext(td, &uc.uc_mcontext);
119 if (ret == 0) {
120 kern_sigprocmask(td, SIG_SETMASK,
121 &uc.uc_sigmask, NULL, 0);
122 }
123 }
124 }
125 }
126 return (ret == 0 ? EJUSTRETURN : ret);
127}
113 PROC_LOCK(td->td_proc);
114 uc.uc_sigmask = td->td_sigmask;
115 PROC_UNLOCK(td->td_proc);
116 ret = copyout(&uc, uap->oucp, UC_COPY_SIZE);
117 if (ret == 0) {
118 ret = copyin(uap->ucp, &uc, UC_COPY_SIZE);
119 if (ret == 0) {
120 ret = set_mcontext(td, &uc.uc_mcontext);
121 if (ret == 0) {
122 kern_sigprocmask(td, SIG_SETMASK,
123 &uc.uc_sigmask, NULL, 0);
124 }
125 }
126 }
127 }
128 return (ret == 0 ? EJUSTRETURN : ret);
129}