Skip to contentSkip to conversation

sctp: check invalid value of length parameter in error

PATCH In review Shan Wei 2 participants 2 messages May 12, 2010 – May 13, 2010

Subsystems (2)
lore
Share & tools
lore

Shan Wei

author
#0 lore raw

PATCH 3/3 sctp: check invalid value of length parameter in error

RFC4960, section 3.3.7 said:
If an endpoint receives an ABORT with a format error or no TCB is found, it MUST silently discard it.

When an endpoint receives ABORT that parameter value is invalid, drop it.

---
 net/sctp/sm_statefuns.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
net/sctp/sm_statefuns.c +8 -1
index 32e75ea..0d2e62f 100644
@@ -2423,8 +2423,15 @@ static sctp_disposition_t __sctp_sf_do_9_1_abort(const struct sctp_endpoint *ep,
 
 	/* See if we have an error cause code in the chunk.  */
 	len = ntohs(chunk->chunk_hdr->length);
-	if (len >= sizeof(struct sctp_chunkhdr) + sizeof(struct sctp_errhdr))
+	if (len >= sizeof(struct sctp_chunkhdr) + sizeof(struct sctp_errhdr)) {
+
+		sctp_errhdr_t *err;
+		sctp_walk_errors(err, chunk->chunk_hdr);
+		if ((void *)err != (void *)chunk->chunk_hdr + len)
+			return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
+
 		error = ((sctp_errhdr_t *)chunk->skb->data)->cause;
+	}
 
 	sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR, SCTP_ERROR(ECONNRESET));
 	/* ASSOC_FAILED will DELETE_TCB. */
Signature · 1 line
1.6.3.3
#1 lore raw

Re: [PATCH 3/3] sctp: check invalid value of length parameter in

Quoted 18 lines

RFC4960, section 3.3.7 said:
If an endpoint receives an ABORT with a format error or no TCB is found, it MUST silently discard it.

When an endpoint receives ABORT that parameter value is invalid, drop it.

---
  net/sctp/sm_statefuns.c |    9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)
net/sctp/sm_statefuns.c +0 -0
index 32e75ea..0d2e62f 100644

net/sctp/sm_statefuns.c static sctp_disposition_t __sctp_sf_do_9_1_abort(const struct sctp_endpoint *ep, · line 2431

Quoted 10 lines
net/sctp/sm_statefuns.c +5 -1
@@ -2423,8 +2423,15 @@ static sctp_disposition_t __sctp_sf_do_9_1_abort(const struct sctp_endpoint *ep,
 
  	/* See if we have an error cause code in the chunk.  */
  	len = ntohs(chunk->chunk_hdr->length);
-	if (len>= sizeof(struct sctp_chunkhdr) + sizeof(struct sctp_errhdr))
+	if (len>= sizeof(struct sctp_chunkhdr) + sizeof(struct sctp_errhdr)) {
+
+		sctp_errhdr_t *err;
+		sctp_walk_errors(err, chunk->chunk_hdr);
+		if ((void *)err != (void *)chunk->chunk_hdr + len)
 

As Vlad said, use "if ((void*)err != (void*)chunk->chunk_end)" instead.

Quoted 8 lines
net/sctp/sm_statefuns.c +3 -0
+			return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
+
  		error = ((sctp_errhdr_t *)chunk->skb->data)->cause;
+	}
 
  	sctp_add_cmd_sf(commands, SCTP_CMD_SET_SK_ERR, SCTP_ERROR(ECONNRESET));

/* ASSOC_FAILED will DELETE_TCB. */