diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-18 10:38:01 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-02-20 22:08:00 +0200 |
| commit | 7e12ceb3ebc63aeb71e91b496032ca22ca55f660 (patch) | |
| tree | a720628c8eef67512aba873033fc352faac80c8d /usr/src/uts/common/syscall/uadmin.c | |
| parent | 7e897d1fc847b22dc338da9a5a59dae0cd8765de (diff) | |
| download | illumos-gate-7e12ceb3ebc63aeb71e91b496032ca22ca55f660.tar.gz | |
10376 uts: NULL pointer issues in genunix
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/syscall/uadmin.c')
| -rw-r--r-- | usr/src/uts/common/syscall/uadmin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/syscall/uadmin.c b/usr/src/uts/common/syscall/uadmin.c index 3f261fcda4..858305504d 100644 --- a/usr/src/uts/common/syscall/uadmin.c +++ b/usr/src/uts/common/syscall/uadmin.c @@ -280,7 +280,7 @@ kadmin(int cmd, int fcn, void *mdep, cred_t *credp) * vfs_syncall() can acquire the vfs locks they need. */ sema_p(&fsflush_sema); - (void) callb_execute_class(CB_CL_UADMIN_PRE_VFS, NULL); + (void) callb_execute_class(CB_CL_UADMIN_PRE_VFS, 0); vfs_unmountall(); (void) VFS_MOUNTROOT(rootvfs, ROOT_UNMOUNT); @@ -442,7 +442,7 @@ uadmin(int cmd, int fcn, uintptr_t mdep) * Certain subcommands intepret a non-NULL mdep value as a pointer to * a boot string. We pull that in as bootargs, if applicable. */ - if (mdep != NULL && + if (mdep != (uintptr_t)NULL && (cmd == A_SHUTDOWN || cmd == A_REBOOT || cmd == A_DUMP || cmd == A_FREEZE || cmd == A_CONFIG)) { bootargs = kmem_zalloc(BOOTARGS_MAX, KM_SLEEP); |