diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-10-17 13:02:40 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-10-17 13:02:40 +0000 |
| commit | 59a59b276f274cff7e883bcc3e10c162cfb3a263 (patch) | |
| tree | 59b25df56be42eb7c8aae7cb02d6f1d39ec61b15 /usr/src/uts/common/fs/proc/prsubr.c | |
| parent | 8259b03da3b4ab815c3b6180f813fcfd57984470 (diff) | |
| parent | d2a70789f056fc6c9ce3ab047b52126d80b0e3da (diff) | |
| download | illumos-joyent-59a59b276f274cff7e883bcc3e10c162cfb3a263.tar.gz | |
[illumos-gate merge]
commit d2a70789f056fc6c9ce3ab047b52126d80b0e3da
7029 want per-process exploit mitigation features (secflags)
7030 want basic address space layout randomization (ASLR)
7031 noexec_user_stack should be a security-flag
7032 want a means to forbid mappings around NULL
commit 8ab1c3f559468e655c4eb8acce993320403dd72b
7469 loader should use acpica provided by OS
commit a1964bdd47804c37e09db1a79c23937c9aeac165
7470 acpi build sometimes doesn't descend into SUBDIRS
commit abf99a006172ea5aab2246bda23f9d6d935bf1ad
7420 signalfd deadlock on pollwakeup
7421 panic in signalfd
Conflicts:
usr/src/cmd/sgs/libconv/common/corenote.c
usr/src/cmd/zonecfg/zonecfg.c
usr/src/cmd/zonecfg/zonecfg.h
usr/src/cmd/zonecfg/zonecfg_grammar.y
usr/src/cmd/zonecfg/zonecfg_lex.l
usr/src/head/libzonecfg.h
usr/src/lib/libzonecfg/common/libzonecfg.c
usr/src/man/man1m/zonecfg.1m
usr/src/man/man4/proc.4
usr/src/pkg/manifests/system-test-ostest.mf
usr/src/test/os-tests/tests/Makefile
usr/src/uts/common/exec/elf/elf.c
usr/src/uts/common/io/signalfd.c
usr/src/uts/common/os/sysent.c
usr/src/uts/common/os/zone.c
usr/src/uts/common/sys/proc.h
usr/src/uts/common/sys/zone.h
Diffstat (limited to 'usr/src/uts/common/fs/proc/prsubr.c')
| -rw-r--r-- | usr/src/uts/common/fs/proc/prsubr.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/proc/prsubr.c b/usr/src/uts/common/fs/proc/prsubr.c index 21c25a01e3..4233e5f5c2 100644 --- a/usr/src/uts/common/fs/proc/prsubr.c +++ b/usr/src/uts/common/fs/proc/prsubr.c @@ -3359,7 +3359,7 @@ pr_free_watched_pages(proc_t *p) */ static int set_watched_page(proc_t *p, caddr_t vaddr, caddr_t eaddr, - ulong_t flags, ulong_t oflags) + ulong_t flags, ulong_t oflags) { struct as *as = p->p_as; avl_tree_t *pwp_tree; @@ -3844,7 +3844,7 @@ pr_getsegsize(struct seg *seg, int reserved) uint_t pr_getprot(struct seg *seg, int reserved, void **tmp, - caddr_t *saddrp, caddr_t *naddrp, caddr_t eaddr) + caddr_t *saddrp, caddr_t *naddrp, caddr_t eaddr) { struct as *as = seg->s_as; @@ -4162,6 +4162,18 @@ prgetcred(proc_t *p, prcred_t *pcrp) mutex_exit(&p->p_crlock); } +void +prgetsecflags(proc_t *p, prsecflags_t *psfp) +{ + ASSERT(psfp != NULL); + + psfp->pr_version = PRSECFLAGS_VERSION_CURRENT; + psfp->pr_lower = p->p_secflags.psf_lower; + psfp->pr_upper = p->p_secflags.psf_upper; + psfp->pr_effective = p->p_secflags.psf_effective; + psfp->pr_inherit = p->p_secflags.psf_inherit; +} + /* * Compute actual size of the prpriv_t structure. */ |