Consistently cleanup mbufs in case of other memory errors.
MFC after: 3 days
This commit is contained in:
parent
e1c9ac987a
commit
fcc3d645b6
@ -5586,7 +5586,6 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
|
||||
m = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
|
||||
if (m == NULL) {
|
||||
/* No memory, INIT timer will re-attempt. */
|
||||
if (op_err)
|
||||
sctp_m_freem(op_err);
|
||||
return;
|
||||
}
|
||||
@ -5776,8 +5775,11 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
|
||||
net->ro._s_addr = sctp_source_address_selection(inp,
|
||||
stcb, (sctp_route_t *)&net->ro,
|
||||
net, 0, vrf_id);
|
||||
if (net->ro._s_addr == NULL)
|
||||
if (net->ro._s_addr == NULL) {
|
||||
sctp_m_freem(op_err);
|
||||
sctp_m_freem(m);
|
||||
return;
|
||||
}
|
||||
|
||||
net->src_addr_selected = 1;
|
||||
|
||||
@ -5806,8 +5808,11 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
|
||||
net->ro._s_addr = sctp_source_address_selection(inp,
|
||||
stcb, (sctp_route_t *)&net->ro,
|
||||
net, 0, vrf_id);
|
||||
if (net->ro._s_addr == NULL)
|
||||
if (net->ro._s_addr == NULL) {
|
||||
sctp_m_freem(op_err);
|
||||
sctp_m_freem(m);
|
||||
return;
|
||||
}
|
||||
|
||||
net->src_addr_selected = 1;
|
||||
}
|
||||
@ -5878,6 +5883,7 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
|
||||
so = inp->sctp_socket;
|
||||
if (so == NULL) {
|
||||
/* memory problem */
|
||||
sctp_m_freem(op_err);
|
||||
sctp_m_freem(m);
|
||||
return;
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user