diff options
| author | raf <none@none> | 2008-01-23 12:00:31 -0800 |
|---|---|---|
| committer | raf <none@none> | 2008-01-23 12:00:31 -0800 |
| commit | a574db851cdc636fc3939b68e80d79fe7fbd57f2 (patch) | |
| tree | 7a28122042d1d24d9c4df92ba257e2d34d111e2e /usr/src/lib/libc/amd64/sys/uadmin.c | |
| parent | 4a7ceb24cfcc0a97f96d86cfe5852ae445b50e57 (diff) | |
| download | illumos-gate-a574db851cdc636fc3939b68e80d79fe7fbd57f2.tar.gz | |
6598890 cancellation code abuses synonyms
--HG--
rename : usr/src/lib/libc/amd64/crt/cerror64.s => deleted_files/usr/src/lib/libc/amd64/crt/cerror64.s
rename : usr/src/lib/libc/port/gen/wait3.c => deleted_files/usr/src/lib/libc/port/gen/wait3.c
rename : usr/src/lib/libc/port/gen/wait4.c => deleted_files/usr/src/lib/libc/port/gen/wait4.c
rename : usr/src/lib/libc/port/sys/fsync.c => deleted_files/usr/src/lib/libc/port/sys/fsync.c
rename : usr/src/lib/libc/sparc/sys/syssun.s => deleted_files/usr/src/lib/libc/sparc/sys/syssun.s
rename : usr/src/lib/libc/common/sys/__fcntl.s => usr/src/lib/libc/common/sys/fcntl.s
rename : usr/src/lib/libc/common/sys/_rename.s => usr/src/lib/libc/common/sys/rename.s
rename : usr/src/lib/libc/port/gen/rename.c => usr/src/lib/libc/port/gen/remove.c
rename : usr/src/lib/libc/port/sys/fcntl.c => usr/src/lib/libc/port/sys/libc_fcntl.c
Diffstat (limited to 'usr/src/lib/libc/amd64/sys/uadmin.c')
| -rw-r--r-- | usr/src/lib/libc/amd64/sys/uadmin.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr/src/lib/libc/amd64/sys/uadmin.c b/usr/src/lib/libc/amd64/sys/uadmin.c index f8f2c0337b..8caf6d5bc3 100644 --- a/usr/src/lib/libc/amd64/sys/uadmin.c +++ b/usr/src/lib/libc/amd64/sys/uadmin.c @@ -18,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -44,6 +45,7 @@ #include <sys/uadmin.h> #include <unistd.h> #include <string.h> +#include <pthread.h> #include <zone.h> static int @@ -102,6 +104,10 @@ uadmin(int cmd, int fcn, uintptr_t mdep) if (legal_arg(bargs) < 0) break; /* bad args */ + /* avoid cancellation in system() */ + (void) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, + NULL); + /* check for /stubboot */ if (stat("/stubboot/boot/grub/menu.lst", &sbuf) == 0) { altroot = "-R /stubboot "; |