diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-12-04 06:01:56 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-12-04 06:01:56 +0000 |
| commit | d976ecae6c5c7e5047b333ca8c7de83acae2055c (patch) | |
| tree | 21789ccda9a5af9b928026c39b33e543c26c8ea1 | |
| parent | fe3c7b9c469a7cc92acb3e6053645624a69d9b5f (diff) | |
Do not think atomicity is required here. In any case, prepare for
ps_pledge to become 64-bits over the next few days (things are getting
a bit tight; most newer pledges will be quite device-driver specific)
| -rw-r--r-- | sys/kern/kern_pledge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 189f1e66f92..bb5ee95814c 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.130 2015/12/03 16:50:44 bluhm Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.131 2015/12/04 06:01:55 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -699,8 +699,8 @@ pledge_namei(struct proc *p, struct nameidata *ni, char *origpath) * worse than pre-pledge, but is a work in * progress, needing a clever design. */ - atomic_setbits_int(&p->p_p->ps_pledge, - PLEDGE_YPACTIVE | PLEDGE_INET); + p->p_p->ps_pledge |= + PLEDGE_YPACTIVE | PLEDGE_INET; return (0); } if (strncmp(path, "/var/yp/binding/", |