diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-23 11:58:30 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-04-23 11:58:30 +0000 |
| commit | 27896fdc5eb580ff60d4bb646cf7488e1b8545b9 (patch) | |
| tree | 4d229bf267060380e957925c5f25baf4ef080b46 /usr/src/uts/common/exec | |
| parent | 8df5b79d939305c16d288657917d81cdd25721b9 (diff) | |
| parent | 995a963f85d39c82ddd55378042f53b3a58c2519 (diff) | |
| download | illumos-joyent-27896fdc5eb580ff60d4bb646cf7488e1b8545b9.tar.gz | |
[illumos-gate merge]
commit 995a963f85d39c82ddd55378042f53b3a58c2519
10726 elfexec: NULL pointer errors
commit ffc2b7d4ae69a2eeeab283452dc5c0d70ce7519f
10723 hci1394: NULL pointer errors
commit accc298111fac9235e2da8bc29e5447a704f03d3
10722 rdsib: NULL pointer errors
commit dd26c2a4ed479de9278176640c3799952ea71ae2
10719 eibnx: NULL pointer errors
commit 11b5d82fcd2fe348d89f47fa6e7abbcd64f9948b
10716 usbvc: NULL pointer errors
commit 2888301ab934162a32ecd126389b2d9ba0ffa01e
10683 kb8042: implement kb8042_rsrv() to get out of interrupt context
commit e6b6ca04e8507fd588b555801518e701ceab9eeb
10605 loader: boot2 build should use ldscript
commit fb8e13ed8c6a64edaf592a26d8888d50e8462971
10832 system(4) refers to coffexec
Conflicts:
usr/src/uts/common/exec/elf/elf.c
Diffstat (limited to 'usr/src/uts/common/exec')
| -rw-r--r-- | usr/src/uts/common/exec/elf/elf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/common/exec/elf/elf.c b/usr/src/uts/common/exec/elf/elf.c index cf5e0bdfd9..a4078bb351 100644 --- a/usr/src/uts/common/exec/elf/elf.c +++ b/usr/src/uts/common/exec/elf/elf.c @@ -266,7 +266,7 @@ mapexec_brand(vnode_t *vp, uarg_t *args, Ehdr *ehdr, Addr *uphdr_vaddr, size_t execsz; if (lddatap != NULL) - *lddatap = NULL; + *lddatap = 0; if (minaddrp != NULL) *minaddrp = NULL; @@ -1117,8 +1117,9 @@ elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, intpdata_t *idatap, * take care of the FPU entries. */ #if defined(__amd64) - if (args->commpage != NULL || - (args->commpage = (uintptr_t)comm_page_mapin()) != NULL) { + if (args->commpage != (uintptr_t)NULL || + (args->commpage = (uintptr_t)comm_page_mapin()) != + (uintptr_t)NULL) { ADDAUX(aux, AT_SUN_COMMPAGE, args->commpage) } else { /* |