From nobody Thu Sep 17 00:37:13 2026 X-Original-To: dev-commits-src-main@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 4hlcK62k9Pz6sZ1W for ; Thu, 17 Sep 2026 00:37:14 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlcK6048Xz4Rjn for ; Thu, 17 Sep 2026 00:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789605434; 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=MvBdNxcZWf72Qtwuh49SE1C1SW9dZTihKkM4lFB7kaE=; b=Z5A9ymYWMSEsoE/nxMoN4EqdvtZFzYzyU0zudT3Q+VJpiIDJEIyOl9pYuopoYtjwKX+eQE KaPbpk3Wx7Ahr+n15VNPwFltdPnmRNBNTjFWcJzngYKPuWJFlToQqAUmWk0QG1vtVyj/WZ EZ5gNP93ynuOFWBmstjm/tflVM3ZENQ/szPYro9F/GptzvUZ4CoXRx2/isB+oNMAP3h2ek lIdWY5XJoUYRESBlV8C/SHjHfcuz3EqixsMLBQt3NpQC+OmZ+F6fryBGO+J2MTYItCIbAY ueG1AgGK8VRj1C3Y203KBOWqjVtQ5vkmHlqmth+GVn2rthcKpveWB0lSBHKAdA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789605434; b=vtbvkV3K/trQE+MaEGQLtU3+mJN9Xx92gLrLAeNKXrQdIqEzp6aV+6GGTbApWuSLWpBuJv tJ8JzikoPkszqxh98kUJTmqEMitvIo1pQvz8v4FOn2cRPgLzw0zgvyh0w7j/s7BiHViCFD clpQOrWGwH0DuNowOAuM8OLfEG+C7ooUHScSoBzGkzTmADg5k+tpvULuuM/Imx3XPt4gGf 4EW+b4NCh3UfYnxLe9xjjMyONwN9p+ETRaxsp+3upKYQEsyJE2nieldQMwOpP6rEOzUtKE iCw5bwkmNgpsB3+9sZ2wc+gnyoKPKeDoV1eCoPNe/70rLFsBAEJ8S5a9fQRbHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789605434; 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=MvBdNxcZWf72Qtwuh49SE1C1SW9dZTihKkM4lFB7kaE=; b=bIweOyJdVeKo6T7x//LiXjFb/JoJ9L8CmyORfVnTYu4ziTCxciXk2WmUwcjIG+tvUWf1i8 f7RatNamwrpDX6ybZCIhWab4S5n360g/ejIDYv5yIEyFgQpnc29JkzQxtko2E37FM7IDt0 6o5HY/W1iWOefFUjLNj6UsQ5ZHu9ztpvEPbCXTezp5fIsoGT8nSpwBsDU4MSC9X4FXGI13 1TL01qrVw0m/gtiHeUMINdXzkJcHBny+mU6u10r0X31tNsfhNW5Refjd3TIWV2B0jSLIBV RBP1YfNoxV87Q4ct6T6+FbxvvIMZq8DbY6A8FjMp6RufaIpVValquFh5Z45tsA== 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 4hlcK55zh3z1803 for ; Thu, 17 Sep 2026 00:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 277f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 17 Sep 2026 00:37:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: aa6683207d18 - main - ping: do a better job checking what we receive from the net List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa6683207d189a0b58ccf8806bd9f8793914bc45 Auto-Submitted: auto-generated Date: Thu, 17 Sep 2026 00:37:13 +0000 Message-Id: <6aab3639.277f0.4496dc33@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=aa6683207d189a0b58ccf8806bd9f8793914bc45 commit aa6683207d189a0b58ccf8806bd9f8793914bc45 Author: Maxim Konovalov AuthorDate: 2026-09-16 20:33:18 +0000 Commit: Maxim Konovalov CommitDate: 2026-09-17 00:31:09 +0000 ping: do a better job checking what we receive from the net - zero out a buffer for the incoming icmp message that we are about to parse - for ICMP_MASKREPLY and ICMP_TSTAMPREPLY responses check their length and warn and reject them if they are truncated Without these checks a part of stack allocated struct icmp icp could be printed out which seems low severity since we already dropped root privileges by the time icp is allocated. Reviewed by: glebius MFC after: 1 month Found with: Claude Code Sonnet 5 Differential Revision: https://reviews.freebsd.org/D59555 --- sbin/ping/ping.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 362264ff2428..5926641a4a50 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1119,6 +1119,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) struct icmp oicmp; const u_char *oicmp_raw; + bzero(&icp, sizeof(icp)); /* * Get size of IP header of the received packet. * The header length is contained in the lower four bits of the first @@ -1158,6 +1159,20 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) if (icp.icmp_type == icmp_type_rsp) { if (icp.icmp_id != ident) return; /* 'Twas not our ECHO */ + if (icmp_type_rsp == ICMP_MASKREPLY && + cc < (ssize_t)(ICMP_MINLEN + MASK_LEN)) { + if (options & F_VERBOSE) + warnx("truncated mask reply (%zd bytes) from %s", + cc, inet_ntoa(from->sin_addr)); + return; + } + if (icmp_type_rsp == ICMP_TSTAMPREPLY && + cc < (ssize_t)(ICMP_MINLEN + TS_LEN)) { + if (options & F_VERBOSE) + warnx("truncated timestamp reply (%zd bytes) from %s", + cc, inet_ntoa(from->sin_addr)); + return; + } ++nreceived; triptime = 0.0; if (timing) {