From owner-svn-src-all@freebsd.org Wed Jun 6 22:34:21 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65E29FE5600; Wed, 6 Jun 2018 22:34:21 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0F1406A1DD; Wed, 6 Jun 2018 22:34:21 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8CC0111EE; Wed, 6 Jun 2018 22:34:20 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w56MYK9I087132; Wed, 6 Jun 2018 22:34:20 GMT (envelope-from tuexen@FreeBSD.org) Received: (from tuexen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w56MYK5m087130; Wed, 6 Jun 2018 22:34:20 GMT (envelope-from tuexen@FreeBSD.org) Message-Id: <201806062234.w56MYK5m087130@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tuexen set sender to tuexen@FreeBSD.org using -f From: Michael Tuexen Date: Wed, 6 Jun 2018 22:34:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r334743 - releng/11.2/sys/netinet X-SVN-Group: releng X-SVN-Commit-Author: tuexen X-SVN-Commit-Paths: releng/11.2/sys/netinet X-SVN-Commit-Revision: 334743 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2018 22:34:21 -0000 Author: tuexen Date: Wed Jun 6 22:34:20 2018 New Revision: 334743 URL: https://svnweb.freebsd.org/changeset/base/334743 Log: MFstable/11 334732: Don't overflow a buffer if we receive an INIT or INIT-ACK chunk without a RANDOM parameter but with a CHUNKS or HMAC-ALGO parameter. Please note that sending this combination violates the specification. Thanks to Ronald E. Crane for reporting the issue for the userland stack. Approved by: re (gjb@) Modified: releng/11.2/sys/netinet/sctp_auth.c releng/11.2/sys/netinet/sctp_pcb.c Directory Properties: releng/11.2/ (props changed) Modified: releng/11.2/sys/netinet/sctp_auth.c ============================================================================== --- releng/11.2/sys/netinet/sctp_auth.c Wed Jun 6 22:29:21 2018 (r334742) +++ releng/11.2/sys/netinet/sctp_auth.c Wed Jun 6 22:34:20 2018 (r334743) @@ -1502,6 +1502,8 @@ sctp_auth_get_cookie_params(struct sctp_tcb *stcb, str if (p_random != NULL) { keylen = sizeof(*p_random) + random_len; memcpy(new_key->key, p_random, keylen); + } else { + keylen = 0; } /* append in the AUTH chunks */ if (chunks != NULL) { Modified: releng/11.2/sys/netinet/sctp_pcb.c ============================================================================== --- releng/11.2/sys/netinet/sctp_pcb.c Wed Jun 6 22:29:21 2018 (r334742) +++ releng/11.2/sys/netinet/sctp_pcb.c Wed Jun 6 22:34:20 2018 (r334743) @@ -6702,6 +6702,8 @@ next_param: if (p_random != NULL) { keylen = sizeof(*p_random) + random_len; memcpy(new_key->key, p_random, keylen); + } else { + keylen = 0; } /* append in the AUTH chunks */ if (chunks != NULL) {