From nobody Thu Oct 22 00:45:40 2026 X-Original-To: dev-commits-src-branches@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 4j96rh4Lwnz6wqxy for ; Thu, 22 Oct 2026 00:45:40 +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 4j96rh3nyzz3LfT for ; Thu, 22 Oct 2026 00:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792629940; 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=cA84F8qzE0f+qAHT8ypF+mVOo4/v+DUtXCe1IOUNe4E=; b=pbURU1h6tWgPs7jKuHaibIfg3ht06iZBPhGK+ZraYRnjeExlq4s8fflEFi+yiM1oY7GEN9 S4uNrpt5S33KzZgQew1XN9z4UzD6aGDEwsFHVq+OkMNEPjOXgTWmuIQbCjHG2rCZ1Um4xX YKmd5/lmIexffPMgek+6+BsHma48WScgSNx4f4pV4RMxynJFTdnqPmmVTTqwEePq7XFwNS feIs8szoyzvicJdMP0Rs32bNa6ygks6W2kCnZzXl4ngSicseknma1MG4kRzYoC+w4c65sc 2ynRDxYDt98XOFdknSWtvM6/ez26GHV+3M8LCBPPNbpDVOkJnIMN6vsMnYREGA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792629940; b=Apk5UoDJB3dpQ0lr84WRfH7dgt1UhsYR9Myqeah7g/OgmIfG0jMJOzfq0xBHqx7mQZVWJE P3KOs/kLqqYjRF6gpZoWjfhmRmbzQBkrF1p2zo16pSt0/hdFHE49kG+xskSUUvINGLX0U2 BgpYkIHFO2hJ0s3Xam38cg9J8U/LLsPzac85sFnHuFstmAmAKLq7FqofsuTAONYNOxx/3Y qf0Stfju1vDG9GAgV7To9zrgeMlimsKpiTbFMSd7LkqXssDSwV01x8reZY8yTj0IzFbzLZ T5N0hrchyePNg5SmzXtsx5Bj+hHnAEI9zKBg4Dfb1BlfSFrhpU58fwkPzPVl1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792629940; 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=cA84F8qzE0f+qAHT8ypF+mVOo4/v+DUtXCe1IOUNe4E=; b=a8ODST4/jw9OiktIOmN8MuXTuujONeSqUDEYPlgnKRoOljW/9Kl6XUFiSurX7WCnSg5qci P+z+j9Edf1BmVDSKZNutHdifYNxQnzM1Z0XEcGq7NIOZnMTipVKOKpASW5Mlfq9DAOiEjd 8Fh6mrjA3iIPw5Mf5KjlmFy72L5KSZS8+tya2glVglNn26qw68TCGd3yiBJFfVkVZrlXuS OMbzFfkaXC+70O9+WBO6ZdDFKWnoCkveZh0RUX4AQXkYGEIqpCHb59Gwpey0lasCiExWTS 0ekRKavqIhTZr3XIYixTpg5NYIqTp/qbnKlKaSPNDY2rZDKTwM6dWS29BOoL9w== 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 4j96rh3SKYzJSn for ; Thu, 22 Oct 2026 00:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40c98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 00:45:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Konovalov Subject: git: 43e0c9c1ed40 - stable/15 - ping: do a better job checking what we receive from the net List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: maxim X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 43e0c9c1ed4097173e8277139110af1e43b3c84a Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 00:45:40 +0000 Message-Id: <6ad95cb4.40c98.3ef253fe@gitrepo.freebsd.org> The branch stable/15 has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=43e0c9c1ed4097173e8277139110af1e43b3c84a commit 43e0c9c1ed4097173e8277139110af1e43b3c84a Author: Maxim Konovalov AuthorDate: 2026-09-16 20:33:18 +0000 Commit: Maxim Konovalov CommitDate: 2026-10-22 00:09:49 +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 (cherry picked from commit aa6683207d189a0b58ccf8806bd9f8793914bc45) --- sbin/ping/ping.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 3fa21760447f..ebad14c59823 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1112,6 +1112,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 @@ -1151,6 +1152,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) {