From owner-svn-src-stable@freebsd.org Mon Aug 31 21:28:10 2020 Return-Path: Delivered-To: svn-src-stable@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 391393CEB27; Mon, 31 Aug 2020 21:28:10 +0000 (UTC) (envelope-from emaste@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 4BgNbZ0l40z47fp; Mon, 31 Aug 2020 21:28:10 +0000 (UTC) (envelope-from emaste@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 F1766E4F2; Mon, 31 Aug 2020 21:28:09 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07VLS9gE032890; Mon, 31 Aug 2020 21:28:09 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VLS9tD032889; Mon, 31 Aug 2020 21:28:09 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202008312128.07VLS9tD032889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 31 Aug 2020 21:28:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365010 - stable/12/sbin/dhclient X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/sbin/dhclient X-SVN-Commit-Revision: 365010 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2020 21:28:10 -0000 Author: emaste Date: Mon Aug 31 21:28:09 2020 New Revision: 365010 URL: https://svnweb.freebsd.org/changeset/base/365010 Log: MFC r364994: dhclient: improve error handling parsing option 119 Reported by: Shlomi Oberman, JSOF Submitted by: delphij Reviewed by: markj Tested by: markj Modified: stable/12/sbin/dhclient/options.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/dhclient/options.c ============================================================================== --- stable/12/sbin/dhclient/options.c Mon Aug 31 21:04:00 2020 (r365009) +++ stable/12/sbin/dhclient/options.c Mon Aug 31 21:28:09 2020 (r365010) @@ -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;