From owner-svn-src-all@freebsd.org Wed Sep 2 16:25:32 2020 Return-Path: Delivered-To: svn-src-all@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 9AB4F3DBFED; Wed, 2 Sep 2020 16:25:32 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhTnS3bKpz3TVj; Wed, 2 Sep 2020 16:25:32 +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 5EA09D254; Wed, 2 Sep 2020 16:25:32 +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 082GPWUD037107; Wed, 2 Sep 2020 16:25:32 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082GPVEu037104; Wed, 2 Sep 2020 16:25:31 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009021625.082GPVEu037104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Wed, 2 Sep 2020 16:25:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365257 - in releng: 11.3/sbin/dhclient 11.4/sbin/dhclient 12.1/sbin/dhclient X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/sbin/dhclient 11.4/sbin/dhclient 12.1/sbin/dhclient X-SVN-Commit-Revision: 365257 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.33 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, 02 Sep 2020 16:25:32 -0000 Author: gordon Date: Wed Sep 2 16:25:31 2020 New Revision: 365257 URL: https://svnweb.freebsd.org/changeset/base/365257 Log: Fix dhclient heap overflow. Approved by: so Security: FreeBSD-SA-20:26.dhclient Security: CVE-2020-7461 Modified: releng/11.3/sbin/dhclient/options.c releng/11.4/sbin/dhclient/options.c releng/12.1/sbin/dhclient/options.c Modified: releng/11.3/sbin/dhclient/options.c ============================================================================== --- releng/11.3/sbin/dhclient/options.c Wed Sep 2 16:24:32 2020 (r365256) +++ releng/11.3/sbin/dhclient/options.c Wed Sep 2 16:25:31 2020 (r365257) @@ -296,6 +296,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; Modified: releng/11.4/sbin/dhclient/options.c ============================================================================== --- releng/11.4/sbin/dhclient/options.c Wed Sep 2 16:24:32 2020 (r365256) +++ releng/11.4/sbin/dhclient/options.c Wed Sep 2 16:25:31 2020 (r365257) @@ -296,6 +296,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2; Modified: releng/12.1/sbin/dhclient/options.c ============================================================================== --- releng/12.1/sbin/dhclient/options.c Wed Sep 2 16:24:32 2020 (r365256) +++ releng/12.1/sbin/dhclient/options.c Wed Sep 2 16:25:31 2020 (r365257) @@ -298,6 +298,8 @@ find_search_domain_name_len(struct option_data *option pointed_len = find_search_domain_name_len(option, &pointer); + if (pointed_len < 0) + return (-1); domain_name_len += pointed_len; *offset = i + 2;