diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-19 17:41:52 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-19 17:41:52 +0000 |
commit | e2a9fbe53d99c36f7375b6323252317c0a797696 (patch) | |
tree | ba62883c1f8da57ab31892ab2df1c84176d2067e /sys/kern | |
parent | 948bfb43e388e598e4957ab145131bfb3db63273 (diff) |
/etc/malloc.conf path-approval in pledge is no longer needed since 6.5
moved option control into a sysctl.
reminder that we can delete this from benjamin baier
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_pledge.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index e6f37fd3645..c969af7c7a1 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.267 2020/10/29 21:15:27 denis Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.268 2021/01/19 17:41:51 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -719,14 +719,6 @@ pledge_namei(struct proc *p, struct nameidata *ni, char *origpath) } break; - case SYS_readlink: - /* Allow /etc/malloc.conf for malloc(3). */ - if ((ni->ni_pledge == PLEDGE_RPATH) && - strcmp(path, "/etc/malloc.conf") == 0) { - ni->ni_cnd.cn_flags |= BYPASSUNVEIL; - return (0); - } - break; case SYS_stat: /* DNS needs /etc/resolv.conf. */ if ((ni->ni_pledge == PLEDGE_RPATH) && |