From nobody Fri Nov 13 22:07:51 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jRBG019mHz6yCL5 for ; Fri, 13 Nov 2026 22:07:52 +0000 (UTC) (envelope-from git@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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jRBG00P31z3KHJ for ; Fri, 13 Nov 2026 22:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaezOvyJNRxxsybnWdLyXR/o8+8WflFcfnQWg8Ybkns=; b=pReK0FMGzbPyjUN2h0JeuGittByx5NwhudW665PcsUoXLUx2L+zVB9HLRLy1xjnlDZqGPO /YJeJ5EA0ImoRTOzNPD7apHxwNtJf7pMfve1jifBFckTpJhBTXi0Vxh4RpbcY1lb1qopQg zxt4wLqxf6ZD+HH9jHDrF4Tk0cvwNZI0e+hn28gLMQ9yE7S5FMDb78uaEtufr+cV2YlaZo 0FBktIvXWNLR/q3UJMeJhtYeaUQ4ykmtGTiZhUlxdqxtbI8mj+Om4z4MZF/Tb/CAup3hFy Icj4NcwpdObJBvsiSg2lt9J8hnyD/+qb0+fyOsS8p11D6ijriaqM7USWigXg6A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794607672; b=Er3DkIihZFGSe+LpjLF53Lc5c9ryLNeb/bev87b02YyVvxJ+OfL9XNbK/Nw+fCfvGBkFQw wJEdeGPKxskdmOF6+SbYY6ocMZT4l5o3NMtvdHR5uHO6EFaMfqDKTyR4WEZZURPWXEYbcu 8ePWHnnXARN+5D8IRKaABH7LvzXVfxHw2U8gA4iK0Xm3dLd3dSxJh7O9erwUNSBvWfghhn hLMhNXwP//VFpZmyC1c5b0yphLdYS4OmLOqn0UBv6gdCwokbivlWoEgs07iKQMFBx19baM 4nuidyRkSkxAfM/sftf3paGNDeMKMNxFl0Duqni/zteS1z1+5fxOSGnsycPz5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794607672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaezOvyJNRxxsybnWdLyXR/o8+8WflFcfnQWg8Ybkns=; b=RFf3S1PyaDnmLv9JZMlXXyPxP6PIOtX+8/AdLO2s1dXsXXFjYLqxFTTyk3rTcJ1SVPzfGc PCcLOSLdMRVBbmL4lOKaOvqxQDv/7Yf734qXOZ009pebOCsfWWHWKsZ14qiqiO3Q1AhQwN wW4LFEqUvJo9LEmBjKHMUGll5CcGGeyPOkJvf9u6gmzUAOXFnxu06ugZfLvRgeMUTVpEJE 1MHuJ4pNyzs1cpU/DotkOf+n7HpEWrw7FFxrI7v17w1MmwqCQ7Ea0LHGIavF6sQbq/UDeG m+8nTrlX2Yb8eEmGOtHQ2TwsGmMoLxqpdvea0eN19C7ciAcK0PiTBqqVwrbhuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jRBFz6jZRzv3R for ; Fri, 13 Nov 2026 22:07:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ce3b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 22:07:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5dd70ecd0070 - stable/14 - dhclient: Avoid out-of-bounds reads in check_classless_option() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5dd70ecd0070cf9a56d78e5f2a2ee9be24323020 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 22:07:51 +0000 Message-Id: <6af78a37.ce3b.1a2818ac@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5dd70ecd0070cf9a56d78e5f2a2ee9be24323020 commit 5dd70ecd0070cf9a56d78e5f2a2ee9be24323020 Author: Mark Johnston AuthorDate: 2026-10-14 21:12:42 +0000 Commit: Mark Johnston CommitDate: 2026-11-13 22:07:31 +0000 dhclient: Avoid out-of-bounds reads in check_classless_option() The loop did not verify that the option buffer is large enough before reading an address. Reported by: Andrew Griffiths MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D60484 (cherry picked from commit 368a1bfcd49315e8dd3e56ca6744ce5d74ef737b) --- sbin/dhclient/dhclient.c | 64 ++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 0c9ead7dedbb..5890ade12391 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -135,7 +135,7 @@ struct sockaddr *get_ifa(char *, int); void routehandler(struct protocol *); void usage(void); int check_option(struct client_lease *l, int option); -int check_classless_option(unsigned char *data, int len); +int check_classless_option(unsigned char *data, size_t len); int ipv4addrs(const char * buf); int res_hnok(const char *dn); int check_search(const char *srch); @@ -2695,43 +2695,56 @@ check_option(struct client_lease *l, int option) /* RFC 3442 The Classless Static Routes option checks */ int -check_classless_option(unsigned char *data, int len) +check_classless_option(unsigned char *data, size_t len) { - int i = 0; - unsigned char width; + unsigned int i; in_addr_t addr, mask; + unsigned char width; if (len < 5) { - warning("Too small length: %d", len); + warning("Too small length: %zu", len); return (0); } - while(i < len) { + for (i = 0; i < len; i += 4) { + unsigned int octets; + width = data[i++]; - if (width == 0) { - i += 4; + octets = (width + 7) / 8; + if (len < i + octets) { + warning("Incorrect data length: %zu", len); + return (0); + } + + switch (octets) { + case 0: continue; - } else if (width < 9) { - addr = (in_addr_t)(data[i] << 24); + case 1: + addr = ((in_addr_t)data[i] << 24); i += 1; - } else if (width < 17) { - addr = (in_addr_t)(data[i] << 24) + - (in_addr_t)(data[i + 1] << 16); + break; + case 2: + addr = ((in_addr_t)data[i] << 24) + + ((in_addr_t)data[i + 1] << 16); i += 2; - } else if (width < 25) { - addr = (in_addr_t)(data[i] << 24) + - (in_addr_t)(data[i + 1] << 16) + - (in_addr_t)(data[i + 2] << 8); + break; + case 3: + addr = ((in_addr_t)data[i] << 24) + + ((in_addr_t)data[i + 1] << 16) + + ((in_addr_t)data[i + 2] << 8); i += 3; - } else if (width < 33) { - addr = (in_addr_t)(data[i] << 24) + - (in_addr_t)(data[i + 1] << 16) + - (in_addr_t)(data[i + 2] << 8) + - data[i + 3]; + break; + case 4: + addr = ((in_addr_t)data[i] << 24) + + ((in_addr_t)data[i + 1] << 16) + + ((in_addr_t)data[i + 2] << 8) + + data[i + 3]; i += 4; - } else { - warning("Incorrect subnet width: %d", width); + break; + default: + warning("Incorrect subnet width: %u", width); return (0); } + mask = (in_addr_t)(~0) << (32 - width); addr = ntohl(addr); mask = ntohl(mask); @@ -2748,10 +2761,9 @@ check_classless_option(unsigned char *data, int len) data[i - 1] = (unsigned char)( (addr >> (((32 - width)/8)*8)) & 0xFF); } - i += 4; } if (i > len) { - warning("Incorrect data length: %d (must be %d)", len, i); + warning("Incorrect data length: %zu (must be %u)", len, i); return (0); } return (1);