miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed error reporting (#671)

This commit is contained in:
Alexey Ivanov 2018-12-23 09:10:14 -08:00 committed by Frank Denis
parent 0d7de697cc
commit 1cf7ce94ba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dnscrypt-proxy/privilege_linux.go
View File

@ -54,13 +54,13 @@ func (proxy *Proxy) dropPrivilege(userStr string, fds []*os.File) {
dlog.Notice("Dropping privileges") dlog.Notice("Dropping privileges")
runtime.LockOSThread() runtime.LockOSThread()
if _, _, rcode := syscall.RawSyscall(syscall.SYS_SETGROUPS, uintptr(0), uintptr(0), 0); rcode != 0 { if _, _, rcode := syscall.RawSyscall(syscall.SYS_SETGROUPS, uintptr(0), uintptr(0), 0); rcode != 0 {
dlog.Fatalf("Unable to drop additional groups: [%s]", err) dlog.Fatalf("Unable to drop additional groups: [%s]", rcode.Error())
} }
if _, _, rcode := syscall.RawSyscall(syscall.SYS_SETGID, uintptr(gid), 0, 0); rcode != 0 { if _, _, rcode := syscall.RawSyscall(syscall.SYS_SETGID, uintptr(gid), 0, 0); rcode != 0 {
dlog.Fatalf("Unable to drop user privileges: [%s]", err) dlog.Fatalf("Unable to drop user privileges: [%s]", rcode.Error())
} }
if _, _, rcode := syscall.RawSyscall(syscall.SYS_SETUID, uintptr(uid), 0, 0); rcode != 0 { if _, _, rcode := syscall.RawSyscall(syscall.SYS_SETUID, uintptr(uid), 0, 0); rcode != 0 {
dlog.Fatalf("Unable to drop user privileges: [%s]", err) dlog.Fatalf("Unable to drop user privileges: [%s]", rcode.Error())
} }
maxfd := uintptr(0) maxfd := uintptr(0)
for _, fd := range fds { for _, fd := range fds {
@ -71,15 +71,15 @@ func (proxy *Proxy) dropPrivilege(userStr string, fds []*os.File) {
fdbase := maxfd + 1 fdbase := maxfd + 1
for i, fd := range fds { for i, fd := range fds {
if _, _, rcode := syscall.RawSyscall(syscall.SYS_DUP3, fd.Fd(), fdbase+uintptr(i), 0); rcode != 0 { if _, _, rcode := syscall.RawSyscall(syscall.SYS_DUP3, fd.Fd(), fdbase+uintptr(i), 0); rcode != 0 {
dlog.Fatal("Unable to clone file descriptor") dlog.Fatalf("Unable to clone file descriptor: [%s]", rcode.Error())
} }
if _, _, rcode := syscall.RawSyscall(syscall.SYS_FCNTL, fd.Fd(), syscall.F_SETFD, syscall.FD_CLOEXEC); rcode != 0 { if _, _, rcode := syscall.RawSyscall(syscall.SYS_FCNTL, fd.Fd(), syscall.F_SETFD, syscall.FD_CLOEXEC); rcode != 0 {
dlog.Fatal("Unable to set the close on exec flag") dlog.Fatalf("Unable to set the close on exec flag: [%s]", rcode.Error())
} }
} }
for i := range fds { for i := range fds {
if _, _, rcode := syscall.RawSyscall(syscall.SYS_DUP3, fdbase+uintptr(i), uintptr(i)+3, 0); rcode != 0 { if _, _, rcode := syscall.RawSyscall(syscall.SYS_DUP3, fdbase+uintptr(i), uintptr(i)+3, 0); rcode != 0 {
dlog.Fatal("Unable to reassign descriptor") dlog.Fatalf("Unable to reassign descriptor: [%s]", rcode.Error())
} }
} }
err = syscall.Exec(path, args, os.Environ()) err = syscall.Exec(path, args, os.Environ())