From: Marcelo Ricardo Leitner Date: Mon, 28 Jun 2021 19:13:44 +0000 (-0300) Subject: sctp: add param size validation for SCTP_PARAM_SET_PRIMARY X-Git-Tag: MMI-RSBS31.Q1-48-36-26~13 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=27af556bdf89836eac1ba0dc7d019ae91d7defa0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git sctp: add param size validation for SCTP_PARAM_SET_PRIMARY commit ef6c8d6ccf0c1dccdda092ebe8782777cd7803c9 upstream. When SCTP handles an INIT chunk, it calls for example: sctp_sf_do_5_1B_init sctp_verify_init sctp_verify_param sctp_process_init sctp_process_param handling of SCTP_PARAM_SET_PRIMARY sctp_verify_init() wasn't doing proper size validation and neither the later handling, allowing it to work over the chunk itself, possibly being uninitialized memory. Mot-CRs-fixed: (CR) CVE-Fixed: CVE-2021-3655 Bug: 197154735 Change-Id: I7435ddba396c7f1efce141e6209db280bffbb6ea Signed-off-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Gajjala Chakradhar Reviewed-on: https://gerrit.mot.com/2197704 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key (cherry picked from commit 5fa7f599b8918a37f65927c9cfe40c9653fe28ee) --- diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 2c08246ea57a..eefb5588c3e0 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -2157,9 +2157,16 @@ static enum sctp_ierror sctp_verify_param(struct net *net, break; case SCTP_PARAM_SET_PRIMARY: - if (net->sctp.addip_enable) - break; - goto fallthrough; + if (!net->sctp.addip_enable) + goto fallthrough; + + if (ntohs(param.p->length) < sizeof(struct sctp_addip_param) + + sizeof(struct sctp_paramhdr)) { + sctp_process_inv_paramlength(asoc, param.p, + chunk, err_chunk); + retval = SCTP_IERROR_ABORT; + } + break; case SCTP_PARAM_HOST_NAME_ADDRESS: /* Tell the peer, we won't support this param. */