Author: tuexen
Date: Tue May 19 07:21:11 2020
New Revision: 361242
URL: https://svnweb.freebsd.org/changeset/base/361242
Log:
Revert r361209:
cem noted that on FreeBSD snprintf() can not fail and code should not
check for that.
A followup commit will replace the usage of snprintf() in the SCTP
sources with a variadic macro SCTP_SNPRINTF, which will simply map to
snprintf() on FreeBSD and do a checking similar to r361209 on
other platforms.
Modified:
head/sys/netinet/sctp_asconf.c
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_pcb.c
Modified: head/sys/netinet/sctp_asconf.c
==============================================================================
--- head/sys/netinet/sctp_asconf.c Tue May 19 07:16:09 2020
(r361241)
+++ head/sys/netinet/sctp_asconf.c Tue May 19 07:21:11 2020
(r361242)
@@ -1706,9 +1706,8 @@ sctp_handle_asconf_ack(struct mbuf *m, int offset,
char msg[SCTP_DIAG_INFO_LEN];
SCTPDBG(SCTP_DEBUG_ASCONF1, "handle_asconf_ack: got unexpected
next serial number! Aborting asoc!\n");
- if (snprintf(msg, sizeof(msg), "Never sent serial number
%8.8x", serial_num) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "Never sent serial number %8.8x",
+ serial_num);
op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION,
msg);
sctp_abort_an_association(stcb->sctp_ep, stcb, op_err,
SCTP_SO_NOT_LOCKED);
*abort_no_unlock = 1;
Modified: head/sys/netinet/sctp_indata.c
==============================================================================
--- head/sys/netinet/sctp_indata.c Tue May 19 07:16:09 2020
(r361241)
+++ head/sys/netinet/sctp_indata.c Tue May 19 07:21:11 2020
(r361242)
@@ -434,26 +434,22 @@ sctp_abort_in_reasm(struct sctp_tcb *stcb,
struct mbuf *oper;
if (stcb->asoc.idata_supported) {
- if (snprintf(msg, sizeof(msg),
+ snprintf(msg, sizeof(msg),
"Reass %x,CF:%x,TSN=%8.8x,SID=%4.4x,FSN=%8.8x,MID:%8.8x",
opspot,
control->fsn_included,
chk->rec.data.tsn,
chk->rec.data.sid,
- chk->rec.data.fsn, chk->rec.data.mid) < 0) {
- msg[0] = '\0';
- }
+ chk->rec.data.fsn, chk->rec.data.mid);
} else {
- if (snprintf(msg, sizeof(msg),
+ snprintf(msg, sizeof(msg),
"Reass %x,CI:%x,TSN=%8.8x,SID=%4.4x,FSN=%4.4x,SSN:%4.4x",
opspot,
control->fsn_included,
chk->rec.data.tsn,
chk->rec.data.sid,
chk->rec.data.fsn,
- (uint16_t)chk->rec.data.mid) < 0) {
- msg[0] = '\0';
- }
+ (uint16_t)chk->rec.data.mid);
}
oper = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
sctp_m_freem(chk->data);
@@ -537,19 +533,15 @@ sctp_queue_data_to_stream(struct sctp_tcb *stcb,
*/
TAILQ_INSERT_HEAD(&strm->inqueue, control, next_instrm);
if (asoc->idata_supported) {
- if (snprintf(msg, sizeof(msg), "Delivered MID=%8.8x,
got TSN=%8.8x, SID=%4.4x, MID=%8.8x",
+ snprintf(msg, sizeof(msg), "Delivered MID=%8.8x, got
TSN=%8.8x, SID=%4.4x, MID=%8.8x",
strm->last_mid_delivered, control->sinfo_tsn,
- control->sinfo_stream, control->mid) < 0) {
- msg[0] = '\0';
- }
+ control->sinfo_stream, control->mid);
} else {
- if (snprintf(msg, sizeof(msg), "Delivered SSN=%4.4x,
got TSN=%8.8x, SID=%4.4x, SSN=%4.4x",
+ snprintf(msg, sizeof(msg), "Delivered SSN=%4.4x, got
TSN=%8.8x, SID=%4.4x, SSN=%4.4x",
(uint16_t)strm->last_mid_delivered,
control->sinfo_tsn,
control->sinfo_stream,
- (uint16_t)control->mid) < 0) {
- msg[0] = '\0';
- }
+ (uint16_t)control->mid);
}
op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION,
msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA +
SCTP_LOC_2;
@@ -656,10 +648,9 @@ sctp_queue_data_to_stream(struct sctp_tcb *stcb,
* to put it on the queue.
*/
if (sctp_place_control_in_stream(strm, asoc, control)) {
- if (snprintf(msg, sizeof(msg),
- "Queue to str MID: %u duplicate", control->mid) <
0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg),
+ "Queue to str MID: %u duplicate",
+ control->mid);
sctp_clean_up_control(stcb, control);
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA
+ SCTP_LOC_3;
@@ -1890,9 +1881,8 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struc
* can *not* be fsn 0. XXX: This can happen in case of a
* wrap around. Ignore is for now.
*/
- if (snprintf(msg, sizeof(msg), "FSN zero for MID=%8.8x, but
flags=%2.2x", mid, chk_flags) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "FSN zero for MID=%8.8x, but
flags=%2.2x",
+ mid, chk_flags);
goto err_out;
}
control = sctp_find_reasm_entry(&asoc->strmin[sid], mid, ordered,
asoc->idata_supported);
@@ -1903,9 +1893,7 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struc
if (control != NULL) {
/* We found something, does it belong? */
if (ordered && (mid != control->mid)) {
- if (snprintf(msg, sizeof(msg), "Reassembly
problem (MID=%8.8x)", mid) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "Reassembly problem
(MID=%8.8x)", mid);
err_out:
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
stcb->sctp_ep->last_abort_code =
SCTP_FROM_SCTP_INDATA + SCTP_LOC_16;
@@ -1918,11 +1906,8 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struc
* We can't have a switched order with an
* unordered chunk
*/
- if (snprintf(msg, sizeof(msg),
- "All fragments of a user message must be
ordered or unordered (TSN=%8.8x)",
- tsn) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "All fragments of a
user message must be ordered or unordered (TSN=%8.8x)",
+ tsn);
goto err_out;
}
if (!ordered && (((control->sinfo_flags >> 8) &
SCTP_DATA_UNORDERED) == 0)) {
@@ -1930,11 +1915,8 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struc
* We can't have a switched unordered with a
* ordered chunk
*/
- if (snprintf(msg, sizeof(msg),
- "All fragments of a user message must be
ordered or unordered (TSN=%8.8x)",
- tsn) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "All fragments of a
user message must be ordered or unordered (TSN=%8.8x)",
+ tsn);
goto err_out;
}
}
@@ -1948,18 +1930,12 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struc
if (ordered || asoc->idata_supported) {
SCTPDBG(SCTP_DEBUG_XXX, "chunk_flags: 0x%x dup
detected on MID: %u\n",
chk_flags, mid);
- if (snprintf(msg, sizeof(msg), "Duplicate
MID=%8.8x detected.", mid) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "Duplicate MID=%8.8x
detected.", mid);
goto err_out;
} else {
if ((tsn == control->fsn_included + 1) &&
(control->end_added == 0)) {
- if (snprintf(msg, sizeof(msg),
- "Illegal message sequence, missing
end for MID: %8.8x",
- control->fsn_included) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "Illegal
message sequence, missing end for MID: %8.8x", control->fsn_included);
goto err_out;
} else {
control = NULL;
@@ -2056,21 +2032,17 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struc
mid, asoc->strmin[sid].last_mid_delivered);
if (asoc->idata_supported) {
- if (snprintf(msg, sizeof(msg), "Delivered MID=%8.8x,
got TSN=%8.8x, SID=%4.4x, MID=%8.8x",
+ snprintf(msg, sizeof(msg), "Delivered MID=%8.8x, got
TSN=%8.8x, SID=%4.4x, MID=%8.8x",
asoc->strmin[sid].last_mid_delivered,
tsn,
sid,
- mid) < 0) {
- msg[0] = '\0';
- }
+ mid);
} else {
- if (snprintf(msg, sizeof(msg), "Delivered SSN=%4.4x,
got TSN=%8.8x, SID=%4.4x, SSN=%4.4x",
+ snprintf(msg, sizeof(msg), "Delivered SSN=%4.4x, got
TSN=%8.8x, SID=%4.4x, SSN=%4.4x",
(uint16_t)asoc->strmin[sid].last_mid_delivered,
tsn,
sid,
- (uint16_t)mid) < 0) {
- msg[0] = '\0';
- }
+ (uint16_t)mid);
}
op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION,
msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA +
SCTP_LOC_17;
@@ -2797,9 +2769,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o
struct mbuf *op_err;
char msg[SCTP_DIAG_INFO_LEN];
- if (snprintf(msg, sizeof(msg), "%s", "I-DATA chunk
received when DATA was negotiated") < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "%s", "I-DATA chunk received
when DATA was negotiated");
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA
+ SCTP_LOC_20;
sctp_abort_an_association(inp, stcb, op_err,
SCTP_SO_NOT_LOCKED);
@@ -2810,9 +2780,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o
struct mbuf *op_err;
char msg[SCTP_DIAG_INFO_LEN];
- if (snprintf(msg, sizeof(msg), "%s", "DATA chunk
received when I-DATA was negotiated") < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "%s", "DATA chunk received
when I-DATA was negotiated");
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA
+ SCTP_LOC_21;
sctp_abort_an_association(inp, stcb, op_err,
SCTP_SO_NOT_LOCKED);
@@ -2835,11 +2803,9 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o
struct mbuf *op_err;
char msg[SCTP_DIAG_INFO_LEN];
- if (snprintf(msg, sizeof(msg), "%s chunk of
length %u",
+ snprintf(msg, sizeof(msg), "%s chunk of length
%u",
ch->chunk_type == SCTP_DATA ? "DATA" :
"I-DATA",
- chk_length) < 0) {
- msg[0] = '\0';
- }
+ chk_length);
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
stcb->sctp_ep->last_abort_code =
SCTP_FROM_SCTP_INDATA + SCTP_LOC_22;
sctp_abort_an_association(inp, stcb, op_err,
SCTP_SO_NOT_LOCKED);
@@ -2908,10 +2874,8 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o
struct mbuf *op_err;
char msg[SCTP_DIAG_INFO_LEN];
- if (snprintf(msg, sizeof(msg), "DATA
chunk followed by chunk of type %2.2x",
- ch->chunk_type) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "DATA chunk
followed by chunk of type %2.2x",
+ ch->chunk_type);
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
sctp_abort_an_association(inp, stcb,
op_err, SCTP_SO_NOT_LOCKED);
return (2);
@@ -2929,9 +2893,8 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *o
struct mbuf *op_err;
char msg[SCTP_DIAG_INFO_LEN];
- if (snprintf(msg, sizeof(msg), "Chunk
of length %u", chk_length) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "Chunk of
length %u",
+ chk_length);
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
stcb->sctp_ep->last_abort_code =
SCTP_FROM_SCTP_INDATA + SCTP_LOC_23;
sctp_abort_an_association(inp, stcb,
op_err, SCTP_SO_NOT_LOCKED);
@@ -4080,11 +4043,8 @@ sctp_express_handle_sack(struct sctp_tcb *stcb, uint32
*abort_now = 1;
/* XXX */
- if (snprintf(msg, sizeof(msg),
- "Cum ack %8.8x greater or equal than TSN %8.8x",
- cumack, send_s) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "Cum ack %8.8x greater or equal than
TSN %8.8x",
+ cumack, send_s);
op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION,
msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA +
SCTP_LOC_24;
sctp_abort_an_association(stcb->sctp_ep, stcb, op_err,
SCTP_SO_NOT_LOCKED);
@@ -4625,11 +4585,8 @@ sctp_handle_sack(struct mbuf *m, int offset_seg, int o
hopeless_peer:
*abort_now = 1;
/* XXX */
- if (snprintf(msg, sizeof(msg),
- "Cum ack %8.8x greater or equal than TSN %8.8x",
- cum_ack, send_s) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "Cum ack %8.8x greater or equal than
TSN %8.8x",
+ cum_ack, send_s);
op_err = sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION,
msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA +
SCTP_LOC_28;
sctp_abort_an_association(stcb->sctp_ep, stcb, op_err,
SCTP_SO_NOT_LOCKED);
@@ -5672,11 +5629,9 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb,
* give out). This must be an attacker.
*/
*abort_flag = 1;
- if (snprintf(msg, sizeof(msg),
+ snprintf(msg, sizeof(msg),
"New cum ack %8.8x too high, highest TSN %8.8x",
- new_cum_tsn, asoc->highest_tsn_inside_map) < 0) {
- msg[0] = '\0';
- }
+ new_cum_tsn, asoc->highest_tsn_inside_map);
op_err =
sctp_generate_cause(SCTP_CAUSE_PROTOCOL_VIOLATION, msg);
stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_INDATA
+ SCTP_LOC_36;
sctp_abort_an_association(stcb->sctp_ep, stcb, op_err,
SCTP_SO_NOT_LOCKED);
Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c Tue May 19 07:16:09 2020
(r361241)
+++ head/sys/netinet/sctp_input.c Tue May 19 07:21:11 2020
(r361242)
@@ -4692,9 +4692,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *
}
}
if (stcb == NULL) {
- if (snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
/* no association, so it's out of the blue... */
@@ -4736,9 +4734,7 @@ sctp_process_control(struct mbuf *m, int iphlen, int *
if (stcb != NULL) {
SCTP_TCB_UNLOCK(stcb);
}
- if (snprintf(msg, sizeof(msg), "OOTB, %s:%d at
%s", __FILE__, __LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
sctp_handle_ootb(m, iphlen, *offset, src, dst,
@@ -5675,9 +5671,7 @@ sctp_common_input_processing(struct mbuf **mm, int iph
SCTP_TCB_UNLOCK(stcb);
stcb = NULL;
SCTP_PROBE5(receive, NULL, stcb, m, stcb, sh);
- if (snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
sctp_handle_ootb(m, iphlen, offset, src, dst, sh, inp,
op_err,
@@ -5739,9 +5733,7 @@ sctp_common_input_processing(struct mbuf **mm, int iph
if (stcb == NULL) {
/* out of the blue DATA chunk */
SCTP_PROBE5(receive, NULL, NULL, m, NULL, sh);
- if (snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
sctp_handle_ootb(m, iphlen, offset, src, dst, sh, inp,
op_err,
@@ -5807,9 +5799,7 @@ sctp_common_input_processing(struct mbuf **mm, int iph
/*
* We consider OOTB any data sent during asoc setup.
*/
- if (snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "OOTB, %s:%d at %s",
__FILE__, __LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
sctp_handle_ootb(m, iphlen, offset, src, dst, sh, inp,
op_err,
Modified: head/sys/netinet/sctp_output.c
==============================================================================
--- head/sys/netinet/sctp_output.c Tue May 19 07:16:09 2020
(r361241)
+++ head/sys/netinet/sctp_output.c Tue May 19 07:21:11 2020
(r361242)
@@ -5581,9 +5581,7 @@ do_a_abort:
if (op_err == NULL) {
char msg[SCTP_DIAG_INFO_LEN];
- if (snprintf(msg, sizeof(msg), "%s:%d at %s", __FILE__,
__LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "%s:%d at %s", __FILE__,
__LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
}
@@ -6760,10 +6758,8 @@ sctp_sendall_iterator(struct sctp_inpcb *inp, struct s
char msg[SCTP_DIAG_INFO_LEN];
abort_anyway:
- if (snprintf(msg, sizeof(msg),
- "%s:%d at %s", __FILE__,
__LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg),
+ "%s:%d at %s", __FILE__,
__LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
atomic_add_int(&stcb->asoc.refcnt, 1);
@@ -9630,10 +9626,8 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp,
struct mbuf *op_err;
char msg[SCTP_DIAG_INFO_LEN];
- if (snprintf(msg, sizeof(msg), "TSN %8.8x retransmitted
%d times, giving up",
- chk->rec.data.tsn, chk->snd_count) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg), "TSN %8.8x retransmitted %d
times, giving up",
+ chk->rec.data.tsn, chk->snd_count);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
atomic_add_int(&stcb->asoc.refcnt, 1);
@@ -13616,10 +13610,8 @@ dataless_eof:
atomic_add_int(&stcb->asoc.refcnt, -1);
free_cnt_applied = 0;
}
- if (snprintf(msg, sizeof(msg),
- "%s:%d at %s", __FILE__, __LINE__,
__func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg, sizeof(msg),
+ "%s:%d at %s", __FILE__, __LINE__,
__func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
NET_EPOCH_ENTER(et);
Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Tue May 19 07:16:09 2020 (r361241)
+++ head/sys/netinet/sctp_pcb.c Tue May 19 07:21:11 2020 (r361242)
@@ -544,13 +544,9 @@ sctp_add_addr_to_vrf(uint32_t vrf_id, void *ifn, uint3
atomic_add_int(&vrf->refcount, 1);
sctp_ifnp->ifn_mtu = SCTP_GATHER_MTU_FROM_IFN_INFO(ifn,
ifn_index, addr->sa_family);
if (if_name != NULL) {
- if (snprintf(sctp_ifnp->ifn_name, SCTP_IFNAMSIZ, "%s",
if_name) < 0) {
- sctp_ifnp->ifn_name[0] = '\0';
- }
+ snprintf(sctp_ifnp->ifn_name, SCTP_IFNAMSIZ, "%s",
if_name);
} else {
- if (snprintf(sctp_ifnp->ifn_name, SCTP_IFNAMSIZ, "%s",
"unknown") < 0) {
- sctp_ifnp->ifn_name[0] = '\0';
- }
+ snprintf(sctp_ifnp->ifn_name, SCTP_IFNAMSIZ, "%s",
"unknown");
}
hash_ifn_head = &SCTP_BASE_INFO(vrf_ifn_hash)[(ifn_index &
SCTP_BASE_INFO(vrf_ifn_hashmark))];
LIST_INIT(&sctp_ifnp->ifalist);
@@ -6221,10 +6217,8 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, s
* in setup state we
* abort this guy
*/
- if (snprintf(msg,
sizeof(msg),
- "%s:%d at %s",
__FILE__, __LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg,
sizeof(msg),
+ "%s:%d at %s",
__FILE__, __LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
sctp_abort_an_association(stcb_tmp->sctp_ep,
@@ -6323,10 +6317,8 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, s
* in setup state we
* abort this guy
*/
- if (snprintf(msg,
sizeof(msg),
- "%s:%d at %s",
__FILE__, __LINE__, __func__) < 0) {
- msg[0] = '\0';
- }
+ snprintf(msg,
sizeof(msg),
+ "%s:%d at %s",
__FILE__, __LINE__, __func__);
op_err =
sctp_generate_cause(SCTP_BASE_SYSCTL(sctp_diag_info_code),
msg);
sctp_abort_an_association(stcb_tmp->sctp_ep,
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
