From nobody Fri Nov 06 20:56:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jLs0n1xTPz6ynJx for ; Fri, 06 Nov 2026 20:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jLs0n0LCxz4dZP for ; Fri, 06 Nov 2026 20:56:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793998585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vHK0+4L2hmne4720ugKtP2Eb+pR7N8bPc0XLj1aCrPk=; b=IbPpGajxmaJAaNvmnzFd8wJJd7eTSEYxUBCWMZbFb+BQiVJrLD0rQWvbQ14nsQv0YQG/I7 uS1lTlUc4jl7Ba+nx8/60qhRndMEn/uhoOHo0hoxOSU8mQwHcvDxp4IWrkyIXUduzOXC7Q nXCdwu+d7UYmbzpRt2iNP38383KpgVawMGOVDRXEXcxwDfFbI1kuxnYLF56mmnTvUuYhM3 nBhtZbMrjIMYxvUy8LSWyrea1YiygiieVoHGVJBabXnf2bvOdQVGQTpJV83GtLi7QxIqZk Uns6pV/mSCdgMcf3qhs/OjQkzHuB0vRJjktZqzD1U4zsJwcsMVKj7OS5peQBXw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793998585; b=poKpyrI+GXPMnE87eiwwJFxC/DMHCsjE6hh90lAeHPErZPhp+1FQFHoRzPFXMv2wEDxXcj Sg65iDClLtITOe1ZYZx+kFW18bdg7/W2vOmczn9He1edJTK2WLIGBBBy9v4oZqHquyyu5+ PIaXPqVJXaWnsba/RSEt6a4DOI4aMyJauTbtIAKLzwQh8qjizxQ7NfOnV7c5ALltyBxHqd URvzMXxGjCQ5l/p9nhp+IQuyxPEEXiCX6tEtfSO2QZrxmOt+8cBpPS6wbJuSUXw2fLkCvG B2o5Q7n3pIHSwYLKJjBEbAv5Ujsg/hwYslh6h/ijRR5DrxGt/KI5I5f85vWXRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793998585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vHK0+4L2hmne4720ugKtP2Eb+pR7N8bPc0XLj1aCrPk=; b=Jc2vqw4EUgvVwJpLOv+d5+mJ2u8zvv3asl0u/b3uhVGCCykJbHDcFqP3FE2QP4EituThoU 1rT4KZQINAR1UErt1zqiFyHy4eQXHj5Ib+esgdXi6pEBJoGWMcvZ0K2JaER/v6ILK/Oy/g STGIvGwWWN6x18TvGpvZObs8mfGsEL7J3u67Doz2NyzJcgDlGZVueIsIo9DBnfctSIJ9lO si7O1wsjeV8fNCxMfLd4SWBle8JNd6P3X+jeX+ZdlTshynqUjI+RVvMZNPPdDtLornN2Uo 7l4R60ursokDDYkGRNW0Sp0wpkqnAkUyCRILIf5ONbSAi+R7i+3JZdJQj7abbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jLs0m6Snkzt9T for ; Fri, 06 Nov 2026 20:56:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2455f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Nov 2026 20:56:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: e0c6b88706a9 - main - irdma: improve TCP header validation List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c6b88706a9fff9e4090803ba2338dd0ce97eba Auto-Submitted: auto-generated Date: Fri, 06 Nov 2026 20:56:19 +0000 Message-Id: <6aee3ef3.2455f.1a90276e@gitrepo.freebsd.org> The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c6b88706a9fff9e4090803ba2338dd0ce97eba commit e0c6b88706a9fff9e4090803ba2338dd0ce97eba Author: Richard Scheffenegger AuthorDate: 2026-11-06 20:42:20 +0000 Commit: Richard Scheffenegger CommitDate: 2026-11-06 20:42:45 +0000 irdma: improve TCP header validation iWARP handling code deals with TCP header processing outside of the normal TCP stack. Add validation checks to verify the internal integrity of the TCP headers. Reviewed By: tuexen, O11 Intel Networking group, #transport, bartosz.sobczak_intel.com Sponsored by: NetApp, Inc. MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D58323 --- sys/dev/irdma/irdma_cm.c | 22 ++++++++++++++++++++-- sys/dev/irdma/irdma_utils.c | 13 +++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/sys/dev/irdma/irdma_cm.c b/sys/dev/irdma/irdma_cm.c index 669d2cf5cb10..7323c07650ee 100644 --- a/sys/dev/irdma/irdma_cm.c +++ b/sys/dev/irdma/irdma_cm.c @@ -822,13 +822,20 @@ irdma_event_connect_error(struct irdma_cm_event *event) */ static int irdma_process_options(struct irdma_cm_node *cm_node, u8 *optionsloc, - u32 optionsize, u32 syn_pkt) + int optionsize, u32 syn_pkt) { u32 tmp; - u32 offset = 0; + int offset = 0; union all_known_options *all_options; char got_mss_option = 0; + if ((optionsize < 0) || (optionsize > MAX_TCPOPTLEN)) { + irdma_debug(&cm_node->iwdev->rf->sc_dev, IRDMA_DEBUG_CM, + "Option Size: %d out of bound\n", + optionsize); + /* return silently */ + return 0; + } while (offset < optionsize) { all_options = (union all_known_options *)(optionsloc + offset); switch (all_options->base.optionnum) { @@ -2668,7 +2675,11 @@ irdma_handle_syn_pkt(struct irdma_cm_node *cm_node, u32 inc_sequence; int optionsize; + if (tcph->th_off < 5) { + return; + } optionsize = (tcph->th_off << 2) - sizeof(*tcph); + inc_sequence = ntohl(tcph->th_seq); switch (cm_node->state) { @@ -2736,7 +2747,11 @@ irdma_handle_synack_pkt(struct irdma_cm_node *cm_node, u32 inc_sequence; int optionsize; + if (tcph->th_off < 5) { + return; + } optionsize = (tcph->th_off << 2) - sizeof(*tcph); + inc_sequence = ntohl(tcph->th_seq); switch (cm_node->state) { case IRDMA_CM_STATE_SYN_SENT: @@ -2811,6 +2826,9 @@ irdma_handle_ack_pkt(struct irdma_cm_node *cm_node, int optionsize; u32 datasize = rbuf->datalen; + if (tcph->th_off < 5) { + return -EINVAL; + } optionsize = (tcph->th_off << 2) - sizeof(*tcph); if (irdma_check_seq(cm_node, tcph)) diff --git a/sys/dev/irdma/irdma_utils.c b/sys/dev/irdma/irdma_utils.c index ef8cb38d8139..a89d91a06822 100644 --- a/sys/dev/irdma/irdma_utils.c +++ b/sys/dev/irdma/irdma_utils.c @@ -1541,6 +1541,13 @@ irdma_gen1_puda_get_tcpip_info(struct irdma_puda_cmpl_info *info, } buf->tcphlen = tcph->th_off << 2; + if (buf->tcphlen < 20) { + irdma_debug(buf->vsi->dev, IRDMA_DEBUG_ERR, + "tcp hlen too small 0x%x\n", + buf->tcphlen); + return -EINVAL; + } + buf->datalen = pkt_len - iphlen - buf->tcphlen; buf->data = buf->datalen ? buf->tcph + buf->tcphlen : NULL; buf->hdrlen = buf->maclen + iphlen + buf->tcphlen; @@ -1581,6 +1588,12 @@ irdma_puda_get_tcpip_info(struct irdma_puda_cmpl_info *info, pkt_len = info->payload_len; buf->totallen = pkt_len; buf->tcphlen = tcph->th_off << 2; + if (buf->tcphlen < 20) { + irdma_debug(buf->vsi->dev, IRDMA_DEBUG_ERR, + "tcp hlen too small 0x%x\n", + buf->tcphlen); + return -EINVAL; + } buf->datalen = pkt_len - IRDMA_TCP_OFFSET - buf->tcphlen; buf->data = buf->datalen ? buf->tcph + buf->tcphlen : NULL; buf->hdrlen = IRDMA_TCP_OFFSET + buf->tcphlen;