diff options
| author | Toomas Soome <tsoome@me.com> | 2020-02-06 09:29:21 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-04-07 13:46:11 +0300 |
| commit | 3fe9882ba9986735cce21c1e187c449d9642d180 (patch) | |
| tree | 0fb8a8e86d4c6d2067bf44bd6a5aa7b90b4bc252 | |
| parent | dd6b11ddff7060f33ccf31e17387d9e1c430a013 (diff) | |
| download | illumos-joyent-3fe9882ba9986735cce21c1e187c449d9642d180.tar.gz | |
12426 swapgeneric: NULL pointer errors
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/os/swapgeneric.c | 6 | ||||
| -rw-r--r-- | usr/src/uts/sparc/swapgeneric/Makefile | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/usr/src/uts/common/os/swapgeneric.c b/usr/src/uts/common/os/swapgeneric.c index 77167149fe..6d22fa40a6 100644 --- a/usr/src/uts/common/os/swapgeneric.c +++ b/usr/src/uts/common/os/swapgeneric.c @@ -910,7 +910,7 @@ load_bootpath_drivers(char *bootpath) rval = load_boot_driver(leaf, NULL); if (rval == -1) { kmem_free(pathcopy, pathcopy_len); - return (NULL); + return (0); } } } @@ -920,7 +920,7 @@ load_bootpath_drivers(char *bootpath) cmn_err(CE_WARN, "can't bind driver for boot path <%s>", bootpath); kmem_free(pathcopy, pathcopy_len); - return (NULL); + return (0); } /* @@ -936,7 +936,7 @@ load_bootpath_drivers(char *bootpath) modloadonly("drv", "ibp") == -1) { cmn_err(CE_CONT, "ibp: cannot load platform driver\n"); kmem_free(pathcopy, pathcopy_len); - return (NULL); + return (0); } /* diff --git a/usr/src/uts/sparc/swapgeneric/Makefile b/usr/src/uts/sparc/swapgeneric/Makefile index 7f107a95d9..cb58eb5b20 100644 --- a/usr/src/uts/sparc/swapgeneric/Makefile +++ b/usr/src/uts/sparc/swapgeneric/Makefile @@ -41,7 +41,6 @@ UTSBASE = ../.. # MODULE = swapgeneric OBJECTS = $(SWAPGENERIC_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SWAPGENERIC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) # @@ -53,7 +52,6 @@ include $(UTSBASE)/sparc/Makefile.sparc # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -62,7 +60,6 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) MODSTUBS_DIR = $(OBJS_DIR) $(MODSTUBS_O) := AS_CPPFLAGS += -DSWAPGENERIC_MODULE CLEANFILES += $(MODSTUBS_O) -CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses @@ -79,12 +76,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # |