diff options
| author | Toomas Soome <tsoome@me.com> | 2020-03-08 09:24:13 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2020-03-15 22:32:42 +0200 |
| commit | 34a4e6b53d2e6f2605fd77cda5b161201d7d0f20 (patch) | |
| tree | 557f4343edf304131e4feabb011ff9f61791fa22 | |
| parent | c9ffe217655ce62448bdb45d6f113f43b4dfcc54 (diff) | |
| download | illumos-joyent-34a4e6b53d2e6f2605fd77cda5b161201d7d0f20.tar.gz | |
12377 aggr: may be used uninitialized
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/aggr/aggr_ctl.c | 8 | ||||
| -rw-r--r-- | usr/src/uts/common/io/aggr/aggr_grp.c | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/usr/src/uts/common/io/aggr/aggr_ctl.c b/usr/src/uts/common/io/aggr/aggr_ctl.c index 1bbad3d904..f0e74ec328 100644 --- a/usr/src/uts/common/io/aggr/aggr_ctl.c +++ b/usr/src/uts/common/io/aggr/aggr_ctl.c @@ -46,6 +46,11 @@ aggr_ioc_modify(void *karg, intptr_t arg, int mode, cred_t *cred, int *rvalp) aggr_lacp_mode_t lacp_mode; aggr_lacp_timer_t lacp_timer; + policy = 0; + mac_fixed = B_FALSE; + lacp_mode = AGGR_LACP_OFF; + lacp_timer = AGGR_LACP_TIMER_LONG; + modify_mask_arg = modify_arg->lu_modify_mask; if (modify_mask_arg & LAIOC_MODIFY_POLICY) { @@ -235,6 +240,9 @@ aggr_ioc_add_remove(laioc_add_rem_t *add_rem_arg, intptr_t arg, int cmd, case LAIOC_REMOVE: rc = aggr_grp_rem_ports(add_rem_arg->la_linkid, nports, ports); break; + default: + rc = 0; + break; } done: diff --git a/usr/src/uts/common/io/aggr/aggr_grp.c b/usr/src/uts/common/io/aggr/aggr_grp.c index 48cdc241d6..80cc3644ea 100644 --- a/usr/src/uts/common/io/aggr/aggr_grp.c +++ b/usr/src/uts/common/io/aggr/aggr_grp.c @@ -748,6 +748,8 @@ aggr_add_pseudo_rx_group(aggr_port_t *port, aggr_pseudo_rx_group_t *rx_grp) ASSERT3U(g_idx, <, MAX_GROUPS_PER_PORT); mac_perim_enter_by_mh(port->lp_mh, &pmph); + i = 0; + addr = NULL; /* * This function must be called after the aggr registers its * MAC and its Rx groups have been initialized. |