From nobody Mon Feb 27 18:25:26 2023 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 4PQTSk4wZ6z3vRkk; Mon, 27 Feb 2023 18:25:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQTSk4PCZz410W; Mon, 27 Feb 2023 18:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522326; 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=yOznJ+oWf7uhHtHPAweHq3WEMimlpJZ/n3ulyJl8l7s=; b=w/gJSgKa4HqGBr4UMmSB6PNlPsfLD31RyB6D+SC97UOrnKacCm5qmKAKfD9vuJD9UE0ltZ eRiAEbhxWV6MRy90FzLa2xPZb0ov5oI3zlmuMU3ql3SM1LdXYkR1czGWz+HGYHwWQg2+7L fZBd8j+jNvz649qJwmLjo9R0x5UGi5eScv47HVkfupEyROLhp6npoO2aMM8CHaRlw9yzGV j3oowETXGjJ8YacVbyvBCkAKQXjBLlqQBHkrWjf6N6UpkYbTFfkcPUX+0/3To939ybIyeZ xUDWLyd0uJOzd8raZV9jy3RRFQee6Fp5lc417WS8JTzLx66WMvSOxJv+ssIOrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677522326; 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=yOznJ+oWf7uhHtHPAweHq3WEMimlpJZ/n3ulyJl8l7s=; b=Da0Zm6RNmFBxW9R1mkg7h6vTXLhfi/aRV3Vg6ppNtenucczfH1LHE88NZqUuLyiu4y/4/j 7hT9tMu5ePFkAkBzsQVmKtSBJUSavBHsrc7dfwQ8mNFQnamWZsMN54q2olyg5E9watOmHe KVzoiKJPrzcbdEBumi62WHmeT/VTBmbLD0kTVbQpmNlfdUfPn7BK5ezV8VH1Wo82PBPNUJ lSbiQa05Uz79/5gs23/+M1Fdagqvr+IS4vlVRaVSA/5DUWxdpOVNCd0HEWcYZ/PayzucFr c1vZyj8vAA+AZasFDvi5cbytGfJ3asnzp1Pz2tS2tsmZIs0/SvlVmjARKI6Fzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677522326; a=rsa-sha256; cv=none; b=HxPX4b8Y5b7cO8+u3sBIxkjjbBHkVhL5mfovv7crhKlQ007SulRSCFfgn/40IuuzpLZtDD 21os+i6Tp12zSakTgZvL/bLqjFQKUjQSdP0RtQ6jwNgNnhc6E6CMjppF+xkKhcd2DivWRZ n8KsTblABmrSkxnKXjhyKFqo0eAbbAwAfeIvBgWu7ktOyP/6EoXSfamd1iv3JB57p37w3B q3STqo/qaLcFLCA/VH86auoH1PyiGFuYScT/mdLOWU5Icat0ZQl9pVshBMhP9UnizmWqpe vCWmyvFb93cn0OcckxyM/a+gr64XVmX88gfrHKmeWlMFLAfplWj++3Yj8tn7Dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQTSk3HFyzc4p; Mon, 27 Feb 2023 18:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31RIPQvU050204; Mon, 27 Feb 2023 18:25:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RIPQSq050203; Mon, 27 Feb 2023 18:25:26 GMT (envelope-from git) Date: Mon, 27 Feb 2023 18:25:26 GMT Message-Id: <202302271825.31RIPQSq050203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 18936d3526f3 - stable/13 - ping: Fix unsigned integer underflow resuling in a ping -R segfault List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 18936d3526f3090e4164b8155762bf5bd54038a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=18936d3526f3090e4164b8155762bf5bd54038a8 commit 18936d3526f3090e4164b8155762bf5bd54038a8 Author: Cy Schubert AuthorDate: 2023-02-23 05:43:17 +0000 Commit: Cy Schubert CommitDate: 2023-02-27 18:24:53 +0000 ping: Fix unsigned integer underflow resuling in a ping -R segfault ping -R (F_RROUTE) will loop at ping.c:1381 until it segfaults or the unsigned int hlen happens to be less than the size of an IP header: slippy$ ping -R 192.168.0.101 PING 192.168.0.101 (192.168.0.101): 56 data bytes 64 bytes from 192.168.0.101: icmp_seq=0 ttl=63 time=1.081 ms RR: 192.168.0.1 192.168.0.101 192.168.0.101 10.1.1.254 10.1.1.91 unknown option bb unknown option 32 unknown option 6 ... unknown option 96 unknown option 2d Segmentation fault The reason for this is while looping through loose source routing (LSRR) and strict source routing (SSRR), hlen will become smaller than the IP header. It may even become negative. This should terminate the loop. However, when hlen is unsigned, an integer underflow occurs becoming a large number causing the loop to continue virtually forever until hlen is either by chance smaller than the lenghth of an IP header or it segfaults. Reviewed by: asomers Fixes: 46d7b45a267b Differential Revision: https://reviews.freebsd.org/D38744 (cherry picked from commit 70960bb86a3ba5b6f5c4652e613e6313a7ed1ac1) --- sbin/ping/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 6956b9a68ad2..2fc876e50776 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1150,7 +1150,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) ssize_t icmp_data_raw_len; double triptime; int dupflag, i, j, recv_len; - uint8_t hlen; + int8_t hlen; uint16_t seq; static int old_rrlen; static char old_rr[MAX_IPOPTLEN]; @@ -1171,7 +1171,7 @@ pr_pack(char *buf, ssize_t cc, struct sockaddr_in *from, struct timespec *tv) hlen = (l & 0x0f) << 2; /* Reject IP packets with a short header */ - if (hlen < sizeof(struct ip)) { + if (hlen < (int8_t) sizeof(struct ip)) { if (options & F_VERBOSE) warn("IHL too short (%d bytes) from %s", hlen, inet_ntoa(from->sin_addr));