Skip to content

Commit

Permalink
12377 aggr: may be used uninitialized
Browse files Browse the repository at this point in the history
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Dan McDonald <danmcd@joyent.com>
  • Loading branch information
tsoome committed Mar 15, 2020
1 parent c9ffe21 commit 34a4e6b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
8 changes: 8 additions & 0 deletions usr/src/uts/common/io/aggr/aggr_ctl.c
Expand Up @@ -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) {
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions usr/src/uts/common/io/aggr/aggr_grp.c
Expand Up @@ -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.
Expand Down

0 comments on commit 34a4e6b

Please sign in to comment.