From owner-svn-src-stable-11@freebsd.org  Mon Aug 31 21:28:58 2020
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 3AF5F3CEDA1;
 Mon, 31 Aug 2020 21:28:58 +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 4BgNcV0qmRz47XR;
 Mon, 31 Aug 2020 21:28:58 +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 F3C90E35B;
 Mon, 31 Aug 2020 21:28:57 +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 07VLSvVe032978;
 Mon, 31 Aug 2020 21:28:57 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VLSvV5032977;
 Mon, 31 Aug 2020 21:28:57 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <202008312128.07VLSvV5032977@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Mon, 31 Aug 2020 21:28:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r365011 - stable/11/sbin/dhclient
X-SVN-Group: stable-11
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: stable/11/sbin/dhclient
X-SVN-Commit-Revision: 365011
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-11@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Aug 2020 21:28:58 -0000

Author: emaste
Date: Mon Aug 31 21:28:57 2020
New Revision: 365011
URL: https://svnweb.freebsd.org/changeset/base/365011

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/11/sbin/dhclient/options.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/dhclient/options.c
==============================================================================
--- stable/11/sbin/dhclient/options.c	Mon Aug 31 21:28:09 2020	(r365010)
+++ stable/11/sbin/dhclient/options.c	Mon Aug 31 21:28:57 2020	(r365011)
@@ -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;