From owner-svn-src-releng@freebsd.org Tue Aug 6 17:12:18 2019 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A92E0C5FEB; Tue, 6 Aug 2019 17:12:18 +0000 (UTC) (envelope-from gordon@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4631Qp3fdYz4F0G; Tue, 6 Aug 2019 17:12:18 +0000 (UTC) (envelope-from gordon@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 5F03D2F2C3; Tue, 6 Aug 2019 17:12:18 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x76HCIDu042856; Tue, 6 Aug 2019 17:12:18 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x76HCHt6042854; Tue, 6 Aug 2019 17:12:17 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201908061712.x76HCHt6042854@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 6 Aug 2019 17:12:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r350646 - in releng: 11.2/contrib/bsnmp/lib 11.3/contrib/bsnmp/lib 12.0/contrib/bsnmp/lib X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.2/contrib/bsnmp/lib 11.3/contrib/bsnmp/lib 12.0/contrib/bsnmp/lib X-SVN-Commit-Revision: 350646 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Aug 2019 17:12:18 -0000 Author: gordon Date: Tue Aug 6 17:12:17 2019 New Revision: 350646 URL: https://svnweb.freebsd.org/changeset/base/350646 Log: Fix insufficient message length validation in bsnmp library. Approved by: so Security: FreeBSD-SA-19:20.bsnmp Security: CVE-2019-5610 Modified: releng/11.2/contrib/bsnmp/lib/asn1.c releng/11.3/contrib/bsnmp/lib/asn1.c releng/12.0/contrib/bsnmp/lib/asn1.c Modified: releng/11.2/contrib/bsnmp/lib/asn1.c ============================================================================== --- releng/11.2/contrib/bsnmp/lib/asn1.c Tue Aug 6 17:11:30 2019 (r350645) +++ releng/11.2/contrib/bsnmp/lib/asn1.c Tue Aug 6 17:12:17 2019 (r350646) @@ -100,6 +100,11 @@ asn_get_header(struct asn_buf *b, u_char *type, asn_le *len = *b->asn_cptr++; b->asn_len--; } + if (*len > b->asn_len) { + asn_error(b, "len %u exceeding asn_len %u", *len, b->asn_len); + return (ASN_ERR_EOBUF); + } + return (ASN_ERR_OK); } Modified: releng/11.3/contrib/bsnmp/lib/asn1.c ============================================================================== --- releng/11.3/contrib/bsnmp/lib/asn1.c Tue Aug 6 17:11:30 2019 (r350645) +++ releng/11.3/contrib/bsnmp/lib/asn1.c Tue Aug 6 17:12:17 2019 (r350646) @@ -100,6 +100,11 @@ asn_get_header(struct asn_buf *b, u_char *type, asn_le *len = *b->asn_cptr++; b->asn_len--; } + if (*len > b->asn_len) { + asn_error(b, "len %u exceeding asn_len %u", *len, b->asn_len); + return (ASN_ERR_EOBUF); + } + return (ASN_ERR_OK); } Modified: releng/12.0/contrib/bsnmp/lib/asn1.c ============================================================================== --- releng/12.0/contrib/bsnmp/lib/asn1.c Tue Aug 6 17:11:30 2019 (r350645) +++ releng/12.0/contrib/bsnmp/lib/asn1.c Tue Aug 6 17:12:17 2019 (r350646) @@ -100,6 +100,11 @@ asn_get_header(struct asn_buf *b, u_char *type, asn_le *len = *b->asn_cptr++; b->asn_len--; } + if (*len > b->asn_len) { + asn_error(b, "len %u exceeding asn_len %u", *len, b->asn_len); + return (ASN_ERR_EOBUF); + } + return (ASN_ERR_OK); }