summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/crypto/io/crypto.c7
-rw-r--r--usr/src/uts/common/crypto/io/cryptoadm.c11
-rw-r--r--usr/src/uts/common/io/bpf/bpf.c6
-rw-r--r--usr/src/uts/common/io/iwh/iwh.c7
-rw-r--r--usr/src/uts/common/io/srn.c5
-rw-r--r--usr/src/uts/common/os/swapgeneric.c6
-rw-r--r--usr/src/uts/intel/io/dnet/dnet.c49
-rw-r--r--usr/src/uts/sparc/swapgeneric/Makefile9
8 files changed, 59 insertions, 41 deletions
diff --git a/usr/src/uts/common/crypto/io/crypto.c b/usr/src/uts/common/crypto/io/crypto.c
index a7c89cb473..bf7616ffdd 100644
--- a/usr/src/uts/common/crypto/io/crypto.c
+++ b/usr/src/uts/common/crypto/io/crypto.c
@@ -1105,6 +1105,7 @@ get_all_mechanism_info(dev_t dev, caddr_t arg, int mode, int *rval)
int error = 0;
int rv;
+ req_count = 0;
STRUCT_INIT(get_all_mech, mode);
STRUCT_INIT(mi, mode);
@@ -2790,6 +2791,7 @@ cipher(dev_t dev, caddr_t arg, int mode,
int rv;
boolean_t rctl_chk = B_FALSE;
+ do_inplace = B_FALSE;
STRUCT_INIT(encrypt, mode);
if ((cm = crypto_hold_minor(getminor(dev))) == NULL) {
@@ -2949,6 +2951,7 @@ cipher_update(dev_t dev, caddr_t arg, int mode,
int rv;
boolean_t rctl_chk = B_FALSE;
+ do_inplace = B_FALSE;
STRUCT_INIT(encrypt_update, mode);
if ((cm = crypto_hold_minor(getminor(dev))) == NULL) {
@@ -5538,6 +5541,7 @@ nostore_generate_key(dev_t dev, caddr_t arg, int mode, int *rval)
boolean_t allocated_by_crypto_module = B_FALSE;
caddr_t u_attrs = NULL;
+ out_count = 0;
STRUCT_INIT(generate_key, mode);
STRUCT_INIT(oa, mode);
@@ -5844,6 +5848,8 @@ nostore_generate_key_pair(dev_t dev, caddr_t arg, int mode, int *rval)
caddr_t u_pub_attrs = NULL;
caddr_t u_pri_attrs = NULL;
+ out_pub_count = 0;
+ out_pri_count = 0;
STRUCT_INIT(generate_key_pair, mode);
STRUCT_INIT(oa, mode);
@@ -6505,6 +6511,7 @@ nostore_derive_key(dev_t dev, caddr_t arg, int mode, int *rval)
boolean_t allocated_by_crypto_module = B_FALSE;
caddr_t u_attrs = NULL;
+ out_count = 0;
STRUCT_INIT(derive_key, mode);
STRUCT_INIT(oa, mode);
diff --git a/usr/src/uts/common/crypto/io/cryptoadm.c b/usr/src/uts/common/crypto/io/cryptoadm.c
index 1192f382d7..008254f610 100644
--- a/usr/src/uts/common/crypto/io/cryptoadm.c
+++ b/usr/src/uts/common/crypto/io/cryptoadm.c
@@ -505,6 +505,10 @@ load_dev_disabled(dev_t dev, caddr_t arg, int mode, int *rval)
uint32_t rv;
int error = 0;
+ entries = NULL;
+ count = 0;
+ instance = 0;
+ rv = CRYPTO_SUCCESS;
if (copyin(arg, &dev_disabled, sizeof (dev_disabled)) != 0) {
error = EFAULT;
goto out2;
@@ -580,6 +584,9 @@ load_soft_disabled(dev_t dev, caddr_t arg, int mode, int *rval)
uint32_t rv;
int error = 0;
+ entries = NULL;
+ count = 0;
+ rv = CRYPTO_SUCCESS;
if (copyin(arg, &soft_disabled, sizeof (soft_disabled)) != 0) {
error = EFAULT;
goto out2;
@@ -660,6 +667,9 @@ load_soft_config(dev_t dev, caddr_t arg, int mode, int *rval)
uint32_t rv;
int error = 0;
+ entries = NULL;
+ count = 0;
+ rv = CRYPTO_SUCCESS;
if (copyin(arg, &soft_config, sizeof (soft_config)) != 0) {
error = EFAULT;
goto out2;
@@ -736,6 +746,7 @@ unload_soft_module(dev_t dev, caddr_t arg, int mode, int *rval)
uint32_t rv;
int error = 0;
+ rv = CRYPTO_SUCCESS;
if (copyin(arg, &unload_soft_module,
sizeof (unload_soft_module)) != 0) {
error = EFAULT;
diff --git a/usr/src/uts/common/io/bpf/bpf.c b/usr/src/uts/common/io/bpf/bpf.c
index 0911020cd6..2d0c266d3d 100644
--- a/usr/src/uts/common/io/bpf/bpf.c
+++ b/usr/src/uts/common/io/bpf/bpf.c
@@ -256,6 +256,8 @@ bpf_attachd(struct bpf_d *d, const char *ifname, int dlt)
ASSERT(d->bd_mcip == (uintptr_t)NULL);
zone = d->bd_zone;
zonematch = B_TRUE;
+ error = 0;
+ bpr = NULL;
again:
mh = 0;
mcip = 0;
@@ -312,6 +314,10 @@ next:
return (error);
}
+ /* No providers? */
+ if (bpr == NULL)
+ return (ENOENT);
+
d->bd_mac = *bpr;
d->bd_mcip = mcip;
d->bd_bif = mh;
diff --git a/usr/src/uts/common/io/iwh/iwh.c b/usr/src/uts/common/io/iwh/iwh.c
index 39b6f27e7f..db1cfba28b 100644
--- a/usr/src/uts/common/io/iwh/iwh.c
+++ b/usr/src/uts/common/io/iwh/iwh.c
@@ -2101,8 +2101,8 @@ iwh_mac_access_exit(iwh_sc_t *sc)
* static uint32_t
* iwh_mem_read(iwh_sc_t *sc, uint32_t addr)
* {
- * IWH_WRITE(sc, HBUS_TARG_MEM_RADDR, addr);
- * return (IWH_READ(sc, HBUS_TARG_MEM_RDAT));
+ * IWH_WRITE(sc, HBUS_TARG_MEM_RADDR, addr);
+ * return (IWH_READ(sc, HBUS_TARG_MEM_RDAT));
* }
*/
@@ -3085,9 +3085,10 @@ iwh_send(ieee80211com_t *ic, mblk_t *mp, uint8_t type)
struct ieee80211_qosframe *qwh = NULL;
int tid = WME_TID_INVALID;
- if (NULL == ic) {
+ if (ic == NULL) {
return (IWH_FAIL);
}
+ rate = 0;
sc = (iwh_sc_t *)ic;
if (sc->sc_flags & IWH_F_SUSPEND) {
diff --git a/usr/src/uts/common/io/srn.c b/usr/src/uts/common/io/srn.c
index 9aaeeb9007..73c875e8a6 100644
--- a/usr/src/uts/common/io/srn.c
+++ b/usr/src/uts/common/io/srn.c
@@ -519,6 +519,7 @@ void
srn_notify(int type, int event)
{
int clone, count;
+
PMD(PMD_SX, ("srn_notify entered with type %d, event 0x%x\n",
type, event));
ASSERT(mutex_owned(&srn_clone_lock));
@@ -538,8 +539,8 @@ srn_notify(int type, int event)
count = srn_autosx_count;
break;
default:
- ASSERT(0);
- break;
+ PMD(PMD_SX, ("unsupported type\n"))
+ return;
}
ASSERT(count > 0);
PMD(PMD_SX, ("count %d\n", count))
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/intel/io/dnet/dnet.c b/usr/src/uts/intel/io/dnet/dnet.c
index e1592ad902..01e9325519 100644
--- a/usr/src/uts/intel/io/dnet/dnet.c
+++ b/usr/src/uts/intel/io/dnet/dnet.c
@@ -438,7 +438,7 @@ dnet_probe(dev_info_t *devinfo)
static int
dnet_hack(dev_info_t *devinfo)
{
- uchar_t vendor_info[SROM_SIZE];
+ uchar_t vendor_info[SROM_SIZE];
uint32_t csr;
uint16_t deviceid;
ddi_acc_handle_t handle;
@@ -505,12 +505,12 @@ static int
dnet_attach(dev_info_t *devinfo, ddi_attach_cmd_t cmd)
{
uint16_t revid;
- struct dnetinstance *dnetp; /* Our private device info */
+ struct dnetinstance *dnetp; /* Our private device info */
mac_register_t *macp;
- uchar_t vendor_info[SROM_SIZE];
+ uchar_t vendor_info[SROM_SIZE];
uint32_t csr;
uint16_t deviceid;
- ddi_acc_handle_t handle;
+ ddi_acc_handle_t handle;
int secondary;
#define DNET_PCI_RNUMBER 1
@@ -1003,7 +1003,7 @@ static int
dnet_set_addr(struct dnetinstance *dnetp)
{
struct tx_desc_type *desc;
- int current_desc;
+ int current_desc;
uint32_t val;
ASSERT(MUTEX_HELD(&dnetp->intrlock));
@@ -1032,13 +1032,13 @@ dnet_set_addr(struct dnetinstance *dnetp)
desc->buffer1 = dnetp->setup_buf_paddr;
desc->buffer2 = 0;
- desc->desc1.buffer_size1 = SETUPBUF_SIZE;
- desc->desc1.buffer_size2 = 0;
+ desc->desc1.buffer_size1 = SETUPBUF_SIZE;
+ desc->desc1.buffer_size2 = 0;
desc->desc1.setup_packet = 1;
desc->desc1.first_desc = 0;
- desc->desc1.last_desc = 0;
- desc->desc1.filter_type0 = 1;
- desc->desc1.filter_type1 = 1;
+ desc->desc1.last_desc = 0;
+ desc->desc1.filter_type0 = 1;
+ desc->desc1.filter_type1 = 1;
desc->desc1.int_on_comp = 1;
desc->desc0.own = 1;
@@ -1128,12 +1128,12 @@ static uint32_t
hashindex(const uint8_t *address)
{
uint32_t crc = (uint32_t)HASH_CRC;
- uint32_t const POLY = HASH_POLY;
+ uint32_t const POLY = HASH_POLY;
uint32_t msb;
- int32_t byteslength;
- uint8_t currentbyte;
- uint32_t index;
- int32_t bit;
+ int32_t byteslength;
+ uint8_t currentbyte;
+ uint32_t index;
+ int32_t bit;
int32_t shift;
for (byteslength = 0; byteslength < ETHERADDRL; byteslength++) {
@@ -1331,6 +1331,7 @@ dnet_send(struct dnetinstance *dnetp, mblk_t *mp)
mblk_t *bp;
ASSERT(MUTEX_HELD(&dnetp->txlock));
+ end_index = 0;
/* reclaim any xmit descriptors completed */
dnet_reclaim_Tx_desc(dnetp);
@@ -1583,7 +1584,7 @@ dnet_getp(struct dnetinstance *dnetp)
{
int packet_length, index;
mblk_t *mp;
- caddr_t virtual_address;
+ caddr_t virtual_address;
struct rx_desc_type *desc = dnetp->rx_desc;
int marker = dnetp->rx_current_desc;
int misses;
@@ -1699,7 +1700,7 @@ dnet_getp(struct dnetinstance *dnetp)
/*
* If no packet errors then do:
- * 1. Allocate a new receive buffer so that we can
+ * 1. Allocate a new receive buffer so that we can
* use the current buffer as streams buffer to
* avoid bcopy.
* 2. If we got a new receive buffer then allocate
@@ -2009,7 +2010,7 @@ set_opr(struct dnetinstance *dnetp)
{
uint32_t fd, mb1, sf;
- int opnmode_len;
+ int opnmode_len;
uint32_t val;
media_block_t *block = dnetp->selected_media_block;
@@ -2859,7 +2860,7 @@ static void
dnet_read21140srom(ddi_acc_handle_t io_handle, caddr_t io_reg, uchar_t *addr,
int maxlen)
{
- uint32_t i, j;
+ uint32_t i, j;
uint32_t dout;
uint16_t word;
uint8_t rom_addr;
@@ -2993,7 +2994,7 @@ get_alternative_srom_image(dev_info_t *devinfo, uchar_t *vi, int len)
*/
pci_regspec_t *assignp;
int assign_len;
- int devnum;
+ int devnum;
int primary_devnum;
primary_devnum = ddi_getprop(DDI_DEV_T_ANY, devinfo, 0,
@@ -3020,10 +3021,10 @@ get_alternative_srom_image(dev_info_t *devinfo, uchar_t *vi, int len)
static void
set_alternative_srom_image(dev_info_t *devinfo, uchar_t *vi, int len)
{
- int proplen;
+ int proplen;
pci_regspec_t *assignp;
int assign_len;
- int devnum;
+ int devnum;
if (ddi_getproplen(DDI_DEV_T_ANY, devinfo, DDI_PROP_DONTPASS,
"DNET_SROM", &proplen) == DDI_PROP_SUCCESS ||
@@ -3520,7 +3521,7 @@ enable_interrupts(struct dnetinstance *dnetp)
* calls dnet_intr for each of them.
* Known cards that suffer from this problem are:
* All Cogent multiport cards;
- * Znyx 314;
+ * Znyx 314;
* Znyx 315.
*
* XXX NEEDSWORK -- see comments above get_alternative_srom_image(). This
@@ -4093,7 +4094,7 @@ dnet_parse_srom(struct dnetinstance *dnetp, SROM_FORMAT *sr, uchar_t *vi)
/* Section 4.2, 4.3, 4.4, 4.5 */
static void
parse_controller_leaf(struct dnetinstance *dnetp, LEAF_FORMAT *leaf,
- uchar_t *vi)
+ uchar_t *vi)
{
int i;
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)
#
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-29 15:20:28 +0000