Commit b91ddd84 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

parents 05bb1fad cb243a1a
...@@ -214,7 +214,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc, ...@@ -214,7 +214,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc,
const struct sctp_chunk *); const struct sctp_chunk *);
struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *, struct sctp_chunk *sctp_make_shutdown_complete(const struct sctp_association *,
const struct sctp_chunk *); const struct sctp_chunk *);
void sctp_init_cause(struct sctp_chunk *, __be16 cause, const void *, size_t); void sctp_init_cause(struct sctp_chunk *, __be16 cause, size_t);
struct sctp_chunk *sctp_make_abort(const struct sctp_association *, struct sctp_chunk *sctp_make_abort(const struct sctp_association *,
const struct sctp_chunk *, const struct sctp_chunk *,
const size_t hint); const size_t hint);
......
...@@ -726,6 +726,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len, ...@@ -726,6 +726,7 @@ int sctp_user_addto_chunk(struct sctp_chunk *chunk, int off, int len,
struct iovec *data); struct iovec *data);
void sctp_chunk_free(struct sctp_chunk *); void sctp_chunk_free(struct sctp_chunk *);
void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data); void *sctp_addto_chunk(struct sctp_chunk *, int len, const void *data);
void *sctp_addto_param(struct sctp_chunk *, int len, const void *data);
struct sctp_chunk *sctp_chunkify(struct sk_buff *, struct sctp_chunk *sctp_chunkify(struct sk_buff *,
const struct sctp_association *, const struct sctp_association *,
struct sock *); struct sock *);
......
...@@ -83,6 +83,7 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc); ...@@ -83,6 +83,7 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc);
/* Skip over an SSN. */ /* Skip over an SSN. */
void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn); void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn);
void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *, __u32);
#endif /* __sctp_ulpqueue_h__ */ #endif /* __sctp_ulpqueue_h__ */
......
...@@ -727,7 +727,12 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, ...@@ -727,7 +727,12 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
break; break;
case SCTP_TRANSPORT_DOWN: case SCTP_TRANSPORT_DOWN:
transport->state = SCTP_INACTIVE; /* if the transort was never confirmed, do not transition it
* to inactive state.
*/
if (transport->state != SCTP_UNCONFIRMED)
transport->state = SCTP_INACTIVE;
spc_state = SCTP_ADDR_UNREACHABLE; spc_state = SCTP_ADDR_UNREACHABLE;
break; break;
......
...@@ -421,6 +421,13 @@ void sctp_retransmit_mark(struct sctp_outq *q, ...@@ -421,6 +421,13 @@ void sctp_retransmit_mark(struct sctp_outq *q,
*/ */
if ((fast_retransmit && (chunk->fast_retransmit > 0)) || if ((fast_retransmit && (chunk->fast_retransmit > 0)) ||
(!fast_retransmit && !chunk->tsn_gap_acked)) { (!fast_retransmit && !chunk->tsn_gap_acked)) {
/* If this chunk was sent less then 1 rto ago, do not
* retransmit this chunk, but give the peer time
* to acknowlege it.
*/
if ((jiffies - chunk->sent_at) < transport->rto)
continue;
/* RFC 2960 6.2.1 Processing a Received SACK /* RFC 2960 6.2.1 Processing a Received SACK
* *
* C) Any time a DATA chunk is marked for * C) Any time a DATA chunk is marked for
......
...@@ -110,7 +110,7 @@ static const struct sctp_paramhdr prsctp_param = { ...@@ -110,7 +110,7 @@ static const struct sctp_paramhdr prsctp_param = {
* abort chunk. * abort chunk.
*/ */
void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code,
const void *payload, size_t paylen) size_t paylen)
{ {
sctp_errhdr_t err; sctp_errhdr_t err;
__u16 len; __u16 len;
...@@ -120,7 +120,6 @@ void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, ...@@ -120,7 +120,6 @@ void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code,
len = sizeof(sctp_errhdr_t) + paylen; len = sizeof(sctp_errhdr_t) + paylen;
err.length = htons(len); err.length = htons(len);
chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err); chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(sctp_errhdr_t), &err);
sctp_addto_chunk(chunk, paylen, payload);
} }
/* 3.3.2 Initiation (INIT) (1) /* 3.3.2 Initiation (INIT) (1)
...@@ -780,8 +779,8 @@ struct sctp_chunk *sctp_make_abort_no_data( ...@@ -780,8 +779,8 @@ struct sctp_chunk *sctp_make_abort_no_data(
/* Put the tsn back into network byte order. */ /* Put the tsn back into network byte order. */
payload = htonl(tsn); payload = htonl(tsn);
sctp_init_cause(retval, SCTP_ERROR_NO_DATA, (const void *)&payload, sctp_init_cause(retval, SCTP_ERROR_NO_DATA, sizeof(payload));
sizeof(payload)); sctp_addto_chunk(retval, sizeof(payload), (const void *)&payload);
/* RFC 2960 6.4 Multi-homed SCTP Endpoints /* RFC 2960 6.4 Multi-homed SCTP Endpoints
* *
...@@ -823,7 +822,8 @@ struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc, ...@@ -823,7 +822,8 @@ struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *asoc,
goto err_copy; goto err_copy;
} }
sctp_init_cause(retval, SCTP_ERROR_USER_ABORT, payload, paylen); sctp_init_cause(retval, SCTP_ERROR_USER_ABORT, paylen);
sctp_addto_chunk(retval, paylen, payload);
if (paylen) if (paylen)
kfree(payload); kfree(payload);
...@@ -850,15 +850,17 @@ struct sctp_chunk *sctp_make_abort_violation( ...@@ -850,15 +850,17 @@ struct sctp_chunk *sctp_make_abort_violation(
struct sctp_paramhdr phdr; struct sctp_paramhdr phdr;
retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t) + paylen retval = sctp_make_abort(asoc, chunk, sizeof(sctp_errhdr_t) + paylen
+ sizeof(sctp_chunkhdr_t)); + sizeof(sctp_paramhdr_t));
if (!retval) if (!retval)
goto end; goto end;
sctp_init_cause(retval, SCTP_ERROR_PROTO_VIOLATION, payload, paylen); sctp_init_cause(retval, SCTP_ERROR_PROTO_VIOLATION, paylen
+ sizeof(sctp_paramhdr_t));
phdr.type = htons(chunk->chunk_hdr->type); phdr.type = htons(chunk->chunk_hdr->type);
phdr.length = chunk->chunk_hdr->length; phdr.length = chunk->chunk_hdr->length;
sctp_addto_chunk(retval, sizeof(sctp_paramhdr_t), &phdr); sctp_addto_chunk(retval, paylen, payload);
sctp_addto_param(retval, sizeof(sctp_paramhdr_t), &phdr);
end: end:
return retval; return retval;
...@@ -955,7 +957,8 @@ struct sctp_chunk *sctp_make_op_error(const struct sctp_association *asoc, ...@@ -955,7 +957,8 @@ struct sctp_chunk *sctp_make_op_error(const struct sctp_association *asoc,
if (!retval) if (!retval)
goto nodata; goto nodata;
sctp_init_cause(retval, cause_code, payload, paylen); sctp_init_cause(retval, cause_code, paylen);
sctp_addto_chunk(retval, paylen, payload);
nodata: nodata:
return retval; return retval;
...@@ -1128,7 +1131,7 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data) ...@@ -1128,7 +1131,7 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data)
void *target; void *target;
void *padding; void *padding;
int chunklen = ntohs(chunk->chunk_hdr->length); int chunklen = ntohs(chunk->chunk_hdr->length);
int padlen = chunklen % 4; int padlen = WORD_ROUND(chunklen) - chunklen;
padding = skb_put(chunk->skb, padlen); padding = skb_put(chunk->skb, padlen);
target = skb_put(chunk->skb, len); target = skb_put(chunk->skb, len);
...@@ -1143,6 +1146,25 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data) ...@@ -1143,6 +1146,25 @@ void *sctp_addto_chunk(struct sctp_chunk *chunk, int len, const void *data)
return target; return target;
} }
/* Append bytes to the end of a parameter. Will panic if chunk is not big
* enough.
*/
void *sctp_addto_param(struct sctp_chunk *chunk, int len, const void *data)
{
void *target;
int chunklen = ntohs(chunk->chunk_hdr->length);
target = skb_put(chunk->skb, len);
memcpy(target, data, len);
/* Adjust the chunk length field. */
chunk->chunk_hdr->length = htons(chunklen + len);
chunk->chunk_end = skb_tail_pointer(chunk->skb);
return target;
}
/* Append bytes from user space to the end of a chunk. Will panic if /* Append bytes from user space to the end of a chunk. Will panic if
* chunk is not big enough. * chunk is not big enough.
* Returns a kernel err value. * Returns a kernel err value.
...@@ -1174,25 +1196,36 @@ out: ...@@ -1174,25 +1196,36 @@ out:
*/ */
void sctp_chunk_assign_ssn(struct sctp_chunk *chunk) void sctp_chunk_assign_ssn(struct sctp_chunk *chunk)
{ {
struct sctp_datamsg *msg;
struct sctp_chunk *lchunk;
struct sctp_stream *stream;
__u16 ssn; __u16 ssn;
__u16 sid; __u16 sid;
if (chunk->has_ssn) if (chunk->has_ssn)
return; return;
/* This is the last possible instant to assign a SSN. */ /* All fragments will be on the same stream */
if (chunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) { sid = ntohs(chunk->subh.data_hdr->stream);
ssn = 0; stream = &chunk->asoc->ssnmap->out;
} else {
sid = ntohs(chunk->subh.data_hdr->stream);
if (chunk->chunk_hdr->flags & SCTP_DATA_LAST_FRAG)
ssn = sctp_ssn_next(&chunk->asoc->ssnmap->out, sid);
else
ssn = sctp_ssn_peek(&chunk->asoc->ssnmap->out, sid);
}
chunk->subh.data_hdr->ssn = htons(ssn); /* Now assign the sequence number to the entire message.
chunk->has_ssn = 1; * All fragments must have the same stream sequence number.
*/
msg = chunk->msg;
list_for_each_entry(lchunk, &msg->chunks, frag_list) {
if (lchunk->chunk_hdr->flags & SCTP_DATA_UNORDERED) {
ssn = 0;
} else {
if (lchunk->chunk_hdr->flags & SCTP_DATA_LAST_FRAG)
ssn = sctp_ssn_next(stream, sid);
else
ssn = sctp_ssn_peek(stream, sid);
}
lchunk->subh.data_hdr->ssn = htons(ssn);
lchunk->has_ssn = 1;
}
} }
/* Helper function to assign a TSN if needed. This assumes that both /* Helper function to assign a TSN if needed. This assumes that both
...@@ -1466,7 +1499,8 @@ no_hmac: ...@@ -1466,7 +1499,8 @@ no_hmac:
__be32 n = htonl(usecs); __be32 n = htonl(usecs);
sctp_init_cause(*errp, SCTP_ERROR_STALE_COOKIE, sctp_init_cause(*errp, SCTP_ERROR_STALE_COOKIE,
&n, sizeof(n)); sizeof(n));
sctp_addto_chunk(*errp, sizeof(n), &n);
*error = -SCTP_IERROR_STALE_COOKIE; *error = -SCTP_IERROR_STALE_COOKIE;
} else } else
*error = -SCTP_IERROR_NOMEM; *error = -SCTP_IERROR_NOMEM;
...@@ -1556,7 +1590,8 @@ static int sctp_process_missing_param(const struct sctp_association *asoc, ...@@ -1556,7 +1590,8 @@ static int sctp_process_missing_param(const struct sctp_association *asoc,
report.num_missing = htonl(1); report.num_missing = htonl(1);
report.type = paramtype; report.type = paramtype;
sctp_init_cause(*errp, SCTP_ERROR_MISS_PARAM, sctp_init_cause(*errp, SCTP_ERROR_MISS_PARAM,
&report, sizeof(report)); sizeof(report));
sctp_addto_chunk(*errp, sizeof(report), &report);
} }
/* Stop processing this chunk. */ /* Stop processing this chunk. */
...@@ -1574,7 +1609,7 @@ static int sctp_process_inv_mandatory(const struct sctp_association *asoc, ...@@ -1574,7 +1609,7 @@ static int sctp_process_inv_mandatory(const struct sctp_association *asoc,
*errp = sctp_make_op_error_space(asoc, chunk, 0); *errp = sctp_make_op_error_space(asoc, chunk, 0);
if (*errp) if (*errp)
sctp_init_cause(*errp, SCTP_ERROR_INV_PARAM, NULL, 0); sctp_init_cause(*errp, SCTP_ERROR_INV_PARAM, 0);
/* Stop processing this chunk. */ /* Stop processing this chunk. */
return 0; return 0;
...@@ -1595,9 +1630,10 @@ static int sctp_process_inv_paramlength(const struct sctp_association *asoc, ...@@ -1595,9 +1630,10 @@ static int sctp_process_inv_paramlength(const struct sctp_association *asoc,
*errp = sctp_make_op_error_space(asoc, chunk, payload_len); *errp = sctp_make_op_error_space(asoc, chunk, payload_len);
if (*errp) { if (*errp) {
sctp_init_cause(*errp, SCTP_ERROR_PROTO_VIOLATION, error, sctp_init_cause(*errp, SCTP_ERROR_PROTO_VIOLATION,
sizeof(error)); sizeof(error) + sizeof(sctp_paramhdr_t));
sctp_addto_chunk(*errp, sizeof(sctp_paramhdr_t), param); sctp_addto_chunk(*errp, sizeof(error), error);
sctp_addto_param(*errp, sizeof(sctp_paramhdr_t), param);
} }
return 0; return 0;
...@@ -1618,9 +1654,10 @@ static int sctp_process_hn_param(const struct sctp_association *asoc, ...@@ -1618,9 +1654,10 @@ static int sctp_process_hn_param(const struct sctp_association *asoc,
if (!*errp) if (!*errp)
*errp = sctp_make_op_error_space(asoc, chunk, len); *errp = sctp_make_op_error_space(asoc, chunk, len);
if (*errp) if (*errp) {
sctp_init_cause(*errp, SCTP_ERROR_DNS_FAILED, sctp_init_cause(*errp, SCTP_ERROR_DNS_FAILED, len);
param.v, len); sctp_addto_chunk(*errp, len, param.v);
}
/* Stop processing this chunk. */ /* Stop processing this chunk. */
return 0; return 0;
...@@ -1672,10 +1709,13 @@ static int sctp_process_unk_param(const struct sctp_association *asoc, ...@@ -1672,10 +1709,13 @@ static int sctp_process_unk_param(const struct sctp_association *asoc,
*errp = sctp_make_op_error_space(asoc, chunk, *errp = sctp_make_op_error_space(asoc, chunk,
ntohs(chunk->chunk_hdr->length)); ntohs(chunk->chunk_hdr->length));
if (*errp) if (*errp) {
sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM,
param.v,
WORD_ROUND(ntohs(param.p->length))); WORD_ROUND(ntohs(param.p->length)));
sctp_addto_chunk(*errp,
WORD_ROUND(ntohs(param.p->length)),
param.v);
}
break; break;
case SCTP_PARAM_ACTION_SKIP: case SCTP_PARAM_ACTION_SKIP:
...@@ -1690,8 +1730,10 @@ static int sctp_process_unk_param(const struct sctp_association *asoc, ...@@ -1690,8 +1730,10 @@ static int sctp_process_unk_param(const struct sctp_association *asoc,
if (*errp) { if (*errp) {
sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM, sctp_init_cause(*errp, SCTP_ERROR_UNKNOWN_PARAM,
param.v,
WORD_ROUND(ntohs(param.p->length))); WORD_ROUND(ntohs(param.p->length)));
sctp_addto_chunk(*errp,
WORD_ROUND(ntohs(param.p->length)),
param.v);
} else { } else {
/* If there is no memory for generating the ERROR /* If there is no memory for generating the ERROR
* report as specified, an ABORT will be triggered * report as specified, an ABORT will be triggered
...@@ -1791,7 +1833,7 @@ int sctp_verify_init(const struct sctp_association *asoc, ...@@ -1791,7 +1833,7 @@ int sctp_verify_init(const struct sctp_association *asoc,
* VIOLATION error. We build the ERROR chunk here and let the normal * VIOLATION error. We build the ERROR chunk here and let the normal
* error handling code build and send the packet. * error handling code build and send the packet.
*/ */
if (param.v < (void*)chunk->chunk_end - sizeof(sctp_paramhdr_t)) { if (param.v != (void*)chunk->chunk_end) {
sctp_process_inv_paramlength(asoc, param.p, chunk, errp); sctp_process_inv_paramlength(asoc, param.p, chunk, errp);
return 0; return 0;
} }
......
...@@ -1013,8 +1013,9 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype, ...@@ -1013,8 +1013,9 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
break; break;
case SCTP_DISPOSITION_VIOLATION: case SCTP_DISPOSITION_VIOLATION:
printk(KERN_ERR "sctp protocol violation state %d " if (net_ratelimit())
"chunkid %d\n", state, subtype.chunk); printk(KERN_ERR "sctp protocol violation state %d "
"chunkid %d\n", state, subtype.chunk);
break; break;
case SCTP_DISPOSITION_NOT_IMPL: case SCTP_DISPOSITION_NOT_IMPL:
...@@ -1130,6 +1131,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, ...@@ -1130,6 +1131,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
/* Move the Cumulattive TSN Ack ahead. */ /* Move the Cumulattive TSN Ack ahead. */
sctp_tsnmap_skip(&asoc->peer.tsn_map, cmd->obj.u32); sctp_tsnmap_skip(&asoc->peer.tsn_map, cmd->obj.u32);
/* purge the fragmentation queue */
sctp_ulpq_reasm_flushtsn(&asoc->ulpq, cmd->obj.u32);
/* Abort any in progress partial delivery. */ /* Abort any in progress partial delivery. */
sctp_ulpq_abort_pd(&asoc->ulpq, GFP_ATOMIC); sctp_ulpq_abort_pd(&asoc->ulpq, GFP_ATOMIC);
break; break;
......
...@@ -264,7 +264,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep, ...@@ -264,7 +264,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
struct sctp_chunk *err_chunk; struct sctp_chunk *err_chunk;
struct sctp_packet *packet; struct sctp_packet *packet;
sctp_unrecognized_param_t *unk_param; sctp_unrecognized_param_t *unk_param;
struct sock *sk;
int len; int len;
/* 6.10 Bundling /* 6.10 Bundling
...@@ -285,16 +284,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep, ...@@ -285,16 +284,6 @@ sctp_disposition_t sctp_sf_do_5_1B_init(const struct sctp_endpoint *ep,
if (ep == sctp_sk((sctp_get_ctl_sock()))->ep) if (ep == sctp_sk((sctp_get_ctl_sock()))->ep)
return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
sk = ep->base.sk;
/* If the endpoint is not listening or if the number of associations
* on the TCP-style socket exceed the max backlog, respond with an
* ABORT.
*/
if (!sctp_sstate(sk, LISTENING) ||
(sctp_style(sk, TCP) &&
sk_acceptq_is_full(sk)))
return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
/* 3.1 A packet containing an INIT chunk MUST have a zero Verification /* 3.1 A packet containing an INIT chunk MUST have a zero Verification
* Tag. * Tag.
*/ */
...@@ -590,6 +579,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep, ...@@ -590,6 +579,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
struct sctp_ulpevent *ev, *ai_ev = NULL; struct sctp_ulpevent *ev, *ai_ev = NULL;
int error = 0; int error = 0;
struct sctp_chunk *err_chk_p; struct sctp_chunk *err_chk_p;
struct sock *sk;
/* If the packet is an OOTB packet which is temporarily on the /* If the packet is an OOTB packet which is temporarily on the
* control endpoint, respond with an ABORT. * control endpoint, respond with an ABORT.
...@@ -605,6 +595,15 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep, ...@@ -605,6 +595,15 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t))) if (!sctp_chunk_length_valid(chunk, sizeof(sctp_chunkhdr_t)))
return sctp_sf_pdiscard(ep, asoc, type, arg, commands); return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
/* If the endpoint is not listening or if the number of associations
* on the TCP-style socket exceed the max backlog, respond with an
* ABORT.
*/
sk = ep->base.sk;
if (!sctp_sstate(sk, LISTENING) ||
(sctp_style(sk, TCP) && sk_acceptq_is_full(sk)))
return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);
/* "Decode" the chunk. We have no optional parameters so we /* "Decode" the chunk. We have no optional parameters so we
* are in good shape. * are in good shape.
*/ */
...@@ -1032,19 +1031,21 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep, ...@@ -1032,19 +1031,21 @@ sctp_disposition_t sctp_sf_backbeat_8_3(const struct sctp_endpoint *ep,
/* This should never happen, but lets log it if so. */ /* This should never happen, but lets log it if so. */
if (unlikely(!link)) { if (unlikely(!link)) {
if (from_addr.sa.sa_family == AF_INET6) { if (from_addr.sa.sa_family == AF_INET6) {
printk(KERN_WARNING if (net_ratelimit())
"%s association %p could not find address " printk(KERN_WARNING
NIP6_FMT "\n", "%s association %p could not find address "
__FUNCTION__, NIP6_FMT "\n",
asoc, __FUNCTION__,
NIP6(from_addr.v6.sin6_addr)); asoc,
NIP6(from_addr.v6.sin6_addr));
} else { } else {
printk(KERN_WARNING if (net_ratelimit())
"%s association %p could not find address " printk(KERN_WARNING
NIPQUAD_FMT "\n", "%s association %p could not find address "
__FUNCTION__, NIPQUAD_FMT "\n",
asoc, __FUNCTION__,
NIPQUAD(from_addr.v4.sin_addr.s_addr)); asoc,
NIPQUAD(from_addr.v4.sin_addr.s_addr));
} }
return SCTP_DISPOSITION_DISCARD; return SCTP_DISPOSITION_DISCARD;
} }
...@@ -3362,7 +3363,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep, ...@@ -3362,7 +3363,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
abort = sctp_make_abort(asoc, asconf_ack, abort = sctp_make_abort(asoc, asconf_ack,
sizeof(sctp_errhdr_t)); sizeof(sctp_errhdr_t));
if (abort) { if (abort) {
sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, NULL, 0); sctp_init_cause(abort, SCTP_ERROR_ASCONF_ACK, 0);
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
SCTP_CHUNK(abort)); SCTP_CHUNK(abort));
} }
...@@ -3392,7 +3393,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep, ...@@ -3392,7 +3393,7 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep,
abort = sctp_make_abort(asoc, asconf_ack, abort = sctp_make_abort(asoc, asconf_ack,
sizeof(sctp_errhdr_t)); sizeof(sctp_errhdr_t));
if (abort) { if (abort) {
sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, NULL, 0); sctp_init_cause(abort, SCTP_ERROR_RSRC_LOW, 0);
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, sctp_add_cmd_sf(commands, SCTP_CMD_REPLY,
SCTP_CHUNK(abort)); SCTP_CHUNK(abort));
} }
......
...@@ -353,6 +353,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) ...@@ -353,6 +353,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len)
* The function sctp_get_port_local() does duplicate address * The function sctp_get_port_local() does duplicate address
* detection. * detection.
*/ */
addr->v4.sin_port = htons(snum);
if ((ret = sctp_get_port_local(sk, addr))) { if ((ret = sctp_get_port_local(sk, addr))) {
if (ret == (long) sk) { if (ret == (long) sk) {
/* This endpoint has a conflicting address. */ /* This endpoint has a conflicting address. */
...@@ -5202,6 +5203,7 @@ SCTP_STATIC int sctp_seqpacket_listen(struct sock *sk, int backlog) ...@@ -5202,6 +5203,7 @@ SCTP_STATIC int sctp_seqpacket_listen(struct sock *sk, int backlog)
sctp_unhash_endpoint(ep); sctp_unhash_endpoint(ep);
sk->sk_state = SCTP_SS_CLOSED; sk->sk_state = SCTP_SS_CLOSED;
return 0;
} }
/* Return if we are already listening. */ /* Return if we are already listening. */
...@@ -5249,6 +5251,7 @@ SCTP_STATIC int sctp_stream_listen(struct sock *sk, int backlog) ...@@ -5249,6 +5251,7 @@ SCTP_STATIC int sctp_stream_listen(struct sock *sk, int backlog)
sctp_unhash_endpoint(ep); sctp_unhash_endpoint(ep);
sk->sk_state = SCTP_SS_CLOSED; sk->sk_state = SCTP_SS_CLOSED;
return 0;
} }
if (sctp_sstate(sk, LISTENING)) if (sctp_sstate(sk, LISTENING))
......