diff options
author | Dan McDonald <danmcd@joyent.com> | 2020-01-31 15:04:37 -0500 |
---|---|---|
committer | Dan McDonald <danmcd@joyent.com> | 2020-02-08 16:55:35 -0500 |
commit | 52aec5b9758f6352670ab269980b437a987f4822 (patch) | |
tree | ebc8867a2838536e51b894699f03e1066b145806 | |
parent | 0dfe541e13279d277d838d6a27e55188b9486cb1 (diff) | |
download | illumos-joyent-52aec5b9758f6352670ab269980b437a987f4822.tar.gz |
12276 smatch-clean sockfs
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Jason King <jason.king@joyent.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
-rw-r--r-- | usr/src/uts/common/fs/sockfs/nl7curi.c | 12 | ||||
-rw-r--r-- | usr/src/uts/common/fs/sockfs/sockfilter.c | 23 | ||||
-rw-r--r-- | usr/src/uts/common/fs/sockfs/socktpi.c | 10 | ||||
-rw-r--r-- | usr/src/uts/intel/sockfs/Makefile | 24 | ||||
-rw-r--r-- | usr/src/uts/sparc/sockfs/Makefile | 21 |
5 files changed, 17 insertions, 73 deletions
diff --git a/usr/src/uts/common/fs/sockfs/nl7curi.c b/usr/src/uts/common/fs/sockfs/nl7curi.c index a8d46d0fe0..0c8276d227 100644 --- a/usr/src/uts/common/fs/sockfs/nl7curi.c +++ b/usr/src/uts/common/fs/sockfs/nl7curi.c @@ -1140,10 +1140,6 @@ nl7c_data(struct sonode *so, uio_t *uio) alloc = kmem_alloc(sz, KM_SLEEP); URI_RD_ADD(uri, rdp, sz, -1); - if (rdp == NULL) { - error = ENOMEM; - goto fail; - } if (uri->hash != URI_TEMP && uri->count > nca_max_cache_size) { uri_delete(uri); @@ -1376,10 +1372,6 @@ nl7c_sendfilev(struct sonode *so, u_offset_t *fileoff, sendfilevec_t *sfvp, fp = NULL; } URI_RD_ADD(uri, rdp, cnt, -1); - if (rdp == NULL) { - error = ENOMEM; - goto fail; - } data = alloc; alloc = NULL; rdp->data.kmem = data; @@ -1405,10 +1397,6 @@ nl7c_sendfilev(struct sonode *so, u_offset_t *fileoff, sendfilevec_t *sfvp, if (len > cnt) { /* More file data so add it */ URI_RD_ADD(uri, rdp, len - cnt, off); - if (rdp == NULL) { - error = ENOMEM; - goto fail; - } rdp->data.vnode = vp; /* Send vnode data out the connection */ diff --git a/usr/src/uts/common/fs/sockfs/sockfilter.c b/usr/src/uts/common/fs/sockfs/sockfilter.c index 971523945e..a2ac9a3fbb 100644 --- a/usr/src/uts/common/fs/sockfs/sockfilter.c +++ b/usr/src/uts/common/fs/sockfs/sockfilter.c @@ -84,13 +84,13 @@ * sof_module_list -> sof_module_t -> ... -> sof_module_t */ -static list_t sof_entry_list; /* list of configured filters */ +static list_t sof_entry_list; /* list of configured filters */ static list_t sof_module_list; /* list of loaded filter modules */ static kmutex_t sof_module_lock; /* protect the module list */ static sof_kstat_t sof_stat; -static kstat_t *sof_stat_ksp; +static kstat_t *sof_stat_ksp; #ifdef DEBUG static int socket_filter_debug = 0; @@ -116,15 +116,15 @@ kmutex_t sof_close_deferred_lock; static void sof_close_deferred(void *); static void sof_module_rele(sof_module_t *); -static sof_module_t *sof_module_hold_by_name(const char *, const char *); +static sof_module_t *sof_module_hold_by_name(const char *, const char *); static int sof_entry_load_module(sof_entry_t *); -static void sof_entry_hold(sof_entry_t *); -static void sof_entry_rele(sof_entry_t *); -static int sof_entry_kstat_create(sof_entry_t *); -static void sof_entry_kstat_destroy(sof_entry_t *); +static void sof_entry_hold(sof_entry_t *); +static void sof_entry_rele(sof_entry_t *); +static int sof_entry_kstat_create(sof_entry_t *); +static void sof_entry_kstat_destroy(sof_entry_t *); -static sof_instance_t *sof_instance_create(sof_entry_t *, struct sonode *); +static sof_instance_t *sof_instance_create(sof_entry_t *, struct sonode *); static void sof_instance_destroy(sof_instance_t *); static int @@ -1080,9 +1080,10 @@ sof_entry_proc_sockparams(sof_entry_t *ent, struct sockparams *sp) fil != NULL; fil = list_next(&sp->sp_auto_filters, fil)) { if (strncmp(ent->sofe_hintarg, - fil->spf_filter->sofe_name, - SOF_MAXNAMELEN) == 0) - break; + fil->spf_filter->sofe_name, SOF_MAXNAMELEN) + == 0) { + break; + } } if (fil != NULL) { diff --git a/usr/src/uts/common/fs/sockfs/socktpi.c b/usr/src/uts/common/fs/sockfs/socktpi.c index cbb8eccd23..b8d83105e8 100644 --- a/usr/src/uts/common/fs/sockfs/socktpi.c +++ b/usr/src/uts/common/fs/sockfs/socktpi.c @@ -4811,8 +4811,8 @@ sodgram_direct(struct sonode *so, struct sockaddr *name, if (auditing) audit_sock(T_UNITDATA_REQ, strvp2wq(SOTOV(so)), mp, 0); - udp_wput(udp_wq, mp); - return (0); + /* Always returns 0... */ + return (udp_wput(udp_wq, mp)); } ASSERT(mpdata == NULL); @@ -4874,8 +4874,8 @@ sostream_direct(struct sonode *so, struct uio *uiop, mblk_t *mp, cred_t *cr) } mp = newmp; } - tcp_wput(tcp_wq, mp); - return (0); + /* Always returns 0... */ + return (tcp_wput(tcp_wq, mp)); } /* Fallback to strwrite() to do proper error handling */ @@ -4925,7 +4925,7 @@ sostream_direct(struct sonode *so, struct uio *uiop, mblk_t *mp, cred_t *cr) } mp = newmp; } - tcp_wput(tcp_wq, mp); + (void) tcp_wput(tcp_wq, mp); /* Always returns 0 anyway. */ wflag |= NOINTR; diff --git a/usr/src/uts/intel/sockfs/Makefile b/usr/src/uts/intel/sockfs/Makefile index 7ca35b6e67..d3b079b652 100644 --- a/usr/src/uts/intel/sockfs/Makefile +++ b/usr/src/uts/intel/sockfs/Makefile @@ -43,7 +43,6 @@ UTSBASE = ../.. # MODULE = sockfs OBJECTS = $(SOCK_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SOCK_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_FS_DIR)/$(MODULE) # @@ -55,7 +54,6 @@ include $(UTSBASE)/intel/Makefile.intel # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -73,19 +71,6 @@ SRCDIR = $(UTSBASE)/common/fs/sockfs TOKGEN = $(SRCDIR)/nl7ctokgen DERIVED_FILES = nl7ctokgen.h CFLAGS += -I. -LINTFLAGS += -I. - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON -LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED -LINTTAGS += -erroff=E_STATIC_UNUSED -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-value @@ -94,9 +79,6 @@ CERRWARN += -_gcc=-Wno-unused-function CERRWARN += -_gcc=-Wno-parentheses CERRWARN += $(CNOWARN_UNINIT) -# needs work -SMATCH=off - # # Default build targets. # @@ -112,12 +94,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) $(RM) $(DERIVED_FILES) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # diff --git a/usr/src/uts/sparc/sockfs/Makefile b/usr/src/uts/sparc/sockfs/Makefile index d2d43d640a..20c15c173c 100644 --- a/usr/src/uts/sparc/sockfs/Makefile +++ b/usr/src/uts/sparc/sockfs/Makefile @@ -42,7 +42,6 @@ UTSBASE = ../.. # MODULE = sockfs OBJECTS = $(SOCK_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SOCK_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_FS_DIR)/$(MODULE) # @@ -54,7 +53,6 @@ include $(UTSBASE)/sparc/Makefile.sparc # Define targets # ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # @@ -73,19 +71,6 @@ SRCDIR = $(UTSBASE)/common/fs/sockfs TOKGEN = $(SRCDIR)/nl7ctokgen DERIVED_FILES = nl7ctokgen.h CFLAGS += -I. -LINTFLAGS += -I. - -# -# For now, disable these lint checks; maintainers should endeavor -# to investigate and remove these for maximum lint coverage. -# Please do not carry these forward to new Makefiles. -# -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN -LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW -LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV -LINTTAGS += -erroff=E_STATIC_UNUSED -LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON -LINTTAGS += -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED CERRWARN += -_gcc=-Wno-unused-label CERRWARN += -_gcc=-Wno-unused-value @@ -109,12 +94,6 @@ clean: $(CLEAN_DEPS) clobber: $(CLOBBER_DEPS) $(RM) $(DERIVED_FILES) -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - install: $(INSTALL_DEPS) # |