in sctp_process_asconf(), we get address parameter from the beginning of
the addip params. but we never check if it's really there. if the addr
param is not there, it still can pass sctp_verify_asconf(), then to be
handled by sctp_process_asconf(), it will not be safe.
so add a code in sctp_verify_asconf() to check the address parameter is in
the beginning, or return false to send abort.
v1->v2:
* put the check behind the params' length verify.
Signed-off-by: Xin Long <lucien....@gmail.com>
---
net/sctp/sm_make_chunk.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 06320c8..89a4d1c 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -3166,6 +3166,13 @@ bool sctp_verify_asconf(const struct sctp_association
*asoc,
return false;
if (!addr_param_needed && addr_param_seen)
return false;
+ if (addr_param_needed && addr_param_seen) {
+ /* Ensure the address parameter is in the beginning */
+ param.v = chunk->skb->data + sizeof(sctp_addiphdr_t);
+ if (param.p->type != SCTP_PARAM_IPV4_ADDRESS &&
+ param.p->type != SCTP_PARAM_IPV6_ADDRESS)
+ return false;
+ }
if (param.v != chunk->chunk_end)
return false;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
