From nobody Tue Nov 15 22:08:41 2022 X-Original-To: dev-commits-src-main@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 4NBgLL03dBz4dBMy; Tue, 15 Nov 2022 22:08:42 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NBgLK6dlMz3FKd; Tue, 15 Nov 2022 22:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668550121; 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=kq9Xp14JnIoH8ZNvbQaXPQLpAhvDauO9IflAB6cr6kc=; b=M6nQSESQEQSBXjwWt4zoS0QBk9QIfg6xIyrytOwrZmHkdEBr2uPZ3d9q1mGLJ+YcLHH5EB +dE1XjOrFHqnxf+bc+IyC83KXzsWIAOOapSaIG8FhB19xXgXHd/JY9+bFiCwbUiUJTFIyc XQQfQ9rLbP7iRWCHSDLKD/Uyw3HfaU/iEfg88XBN9HD6C7B2XyxFNYc5MZuf4jygAYafst zt3zYxqrS15eApyE0gzuY+U0bTKVJUd384Rz/qSgGz4mbnuDKZJ3V/PeQyGWbqqdyvF5QE djTzpVQQKoMZ3JaucIqCJFXqSoiqC2DB8+4XRcNKeyUvL/xUaw06M5/1MQfTRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668550121; 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=kq9Xp14JnIoH8ZNvbQaXPQLpAhvDauO9IflAB6cr6kc=; b=GqSVoWfXI0aJb2eQlqMsdzHTwKoJyMKK4RnDvfLjA8NGWX7UlFo1y3i3GhSeR3hZZAHQO8 BMWqIrV652YNebR8gGqtdMh77O4aVRv/vLv1XVjhyoM7kyP+Fomt2KcqcvWlxB1mlkm3xE nQb9KoQrs8cpWiGkn5eB89YUvpcSadvaMo3keUr8FrkLAfxdLV1mU8cQ2gqZXgFRmwYaCR gJIQHRCMvLyz4P0annN8rEwjfk3267mTkG/UK0y1X8jV4hnpoyhNT7z+y3UJ4lSDxL9CNF BNZBX/h1ifwaYmaKLPvctk2xw1EsxedxLNqHOAqx/3v4NdO4+HciG4u51xbu8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668550121; a=rsa-sha256; cv=none; b=B94+wWhUyJ+II+aT9hz3u8AoPLxv1h//s+gcvHK7huTLdQp4nV+BCrC7c9QJie6wKxIntR Ks4WU60nQXYjg9+j6IdruoYc00Eypx6zXvgXEKDa7dRILeSiByUqxP+KtavH1z08zm00Vl OeiXOt/6/TowACOs6h/jesbdV6gbip4Yv0o14y4xfVKa11lbSoj09+64kDI+qdHBwyk4YA ziyyr0aZVlkcj3O/73HJ0Gat9xqKoGVdQxAQQ1/e/ZQrGhqCUhsMe5YWa5v9PXOMq7Rrwm w10Vv5oL5irB68ZpbJYzx8nq46L88H42OJ+5zR+4zoTKbHF8yTQiUwNp26Jugg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NBgLK5R6VzdHp; Tue, 15 Nov 2022 22:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AFM8fsW000758; Tue, 15 Nov 2022 22:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFM8f2B000757; Tue, 15 Nov 2022 22:08:41 GMT (envelope-from git) Date: Tue, 15 Nov 2022 22:08:41 GMT Message-Id: <202211152208.2AFM8f2B000757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 9a714376212e - main - libalias: improve handling of invalid SCTP packets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a714376212ec1685fdc4cf254f2136a07ae6d2c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9a714376212ec1685fdc4cf254f2136a07ae6d2c commit 9a714376212ec1685fdc4cf254f2136a07ae6d2c Author: Michael Tuexen AuthorDate: 2022-11-15 20:05:02 +0000 Commit: Michael Tuexen CommitDate: 2022-11-15 20:05:02 +0000 libalias: improve handling of invalid SCTP packets In case of a paritial chunk only pretend the result is OK if the packet is not the last fragment and there is a valid association. PR: 267476 MFC after: 3 days --- sys/netinet/libalias/alias_sctp.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/netinet/libalias/alias_sctp.c b/sys/netinet/libalias/alias_sctp.c index 8dc432ef6307..beb1e6072637 100644 --- a/sys/netinet/libalias/alias_sctp.c +++ b/sys/netinet/libalias/alias_sctp.c @@ -754,8 +754,11 @@ SctpAlias(struct libalias *la, struct ip *pip, int direction) case SN_PARSE_OK: break; case SN_PARSE_ERROR_CHHL: - /* Not an error if there is a chunk length parsing error and this is a fragmented packet */ - if (ntohs(pip->ip_off) & IP_MF) { + /* + * Not an error, if there is a chunk length parsing error, + * this is a fragmented packet, and we have a valid assoc. + */ + if ((assoc != NULL) && (ntohs(pip->ip_off) & IP_MF)) { rtnval = SN_PARSE_OK; break; } @@ -1067,6 +1070,8 @@ sctp_PktParser(struct libalias *la, int direction, struct ip *pip, * Also, I am only interested in the content of INIT and ADDIP chunks */ + sm->msg = SN_SCTP_OTHER;/* Initialise to largest value*/ + sm->chunk_length = 0; /* only care about length for key chunks */ // no mbuf stuff from Paolo yet so ... sm->ip_hdr = pip; /* remove ip header length from the bytes_left */ @@ -1114,8 +1119,6 @@ sctp_PktParser(struct libalias *la, int direction, struct ip *pip, chunk_count = 1; /* Real packet parsing occurs below */ - sm->msg = SN_SCTP_OTHER;/* Initialise to largest value*/ - sm->chunk_length = 0; /* only care about length for key chunks */ while (IS_SCTP_CONTROL(chunk_hdr)) { switch (chunk_hdr->chunk_type) { case SCTP_INITIATION: