From nobody Fri Apr 24 00:54:47 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 4g1vcl6nvMz6bWNq for ; Fri, 24 Apr 2026 00:54:47 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1vcl6GWDz3Q93 for ; Fri, 24 Apr 2026 00:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776992087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJIqoR6y1iJqPlDMm6LrVRqNY84ptHfEqI9rlerMFP4=; b=ZN3v8w1UDsREYgb6+qxHgwC7QcUlVMs1+bSLx9LZggOktrnCBD3MPHwg4MA/uqRIAMgYeu LkvRqj73mFV6RZvXiBHJRWQ/9QGG7QW0wQ3YlOfFn8wVg/LCZqgj5MUIGTJMo1U8i16/51 3Yj34nlsORFnv9FNAMXr//VD153tvLGP1mBfbG4lxiF2gmen56aQGcCO4T8Er1JcLg78pt AU39UhoBtijKDrAnQ3+IxbuM8AN+skDmcxxGmkZ4/MDDxv+Hf3HOVEaVyw4LJYHOJWnjWh AcgVkl1BAje9iiJLce549IaxKgqzM3LP3nMYvH2U9ZUJMpEEUfTYXaxhugUpEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776992087; a=rsa-sha256; cv=none; b=T7aL9OfHAXFguuTKaad8MsANxYcoTi9V8ZWC0+FE8dUm4ZUBUykZgW2Wfe2Fy2OydfFstu zIiiBOn3eWTZfI71tSy/HCasm1zd7WPUci72Jt8IHekRzUmqMxrKkRTLVvvOxih2HPiGP1 KzcSmJd3Pi2FcPtKHoOgB4KE6ZDosbLFFgk8rF1Y41+NQW171Ksho+hPYGi6d5y3K76MOi KT462a4Ri5/3WuCwkiFZPaI59T1si7eEr+pGF/LwEQGGGYHH6q/xoTlhckIGN54vGfik5Q QAEL5u1REDRdm0yY92d+U2AmIRa4y2Z50XBx/ZDDteuMxaAcKupaHj+zYvB1ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776992087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJIqoR6y1iJqPlDMm6LrVRqNY84ptHfEqI9rlerMFP4=; b=D9C6je5RFdvYquIjWXRodji9aMKGlW2Jtx9j/FFM3s0SnHQHO4rrycMhG4G5YyUJJlGRt1 XvafELy4niNRoW2H0f/oAqJCSXs+Xz/EhEy+wgIS5Vhkp5aQsI2BNbiY8KtVhQzm65ZEzf XwGUCpi2L0nZ1YdSaEGyPAkMDxURTPoWjmYDtGjG2XNuqZDEdKRypI3AAvzwuBDlS00YkP QWVFQOnz1AZUfjcwqf5yNMh7RDfk8Rp9Nzj4c7lcPf0IuduPuNRQJ+oG1hFkBLNG4FiABX IzNX2WcZnzKbbDoT+8NKRhp+wLkdjO5+/yLr8VS8LqbRCjJ7TMWKJKgPO5763Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1vcl5dP9zgty for ; Fri, 24 Apr 2026 00:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 219a7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 00:54:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christos Longros From: Jose Luis Duran Subject: git: c2b4fbdb45e9 - stable/13 - ping6: treat setsockopt failures as fatal List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2b4fbdb45e995c91afde8ab796270bc0dadea37 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 00:54:47 +0000 Message-Id: <69eabf57.219a7.3f25e4ca@gitrepo.freebsd.org> The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=c2b4fbdb45e995c91afde8ab796270bc0dadea37 commit c2b4fbdb45e995c91afde8ab796270bc0dadea37 Author: Christos Longros AuthorDate: 2026-04-17 18:19:24 +0000 Commit: Jose Luis Duran CommitDate: 2026-04-24 00:53:10 +0000 ping6: treat setsockopt failures as fatal ping6 needs IPV6_RECVPKTINFO and IPV6_RECVHOPLIMIT to process incoming replies. When these options fail, replies are silently dropped and ping6 appears to hang. Use err(3) instead of warn(3) so the user gets a clear error and immediate exit. Signed-off-by: Christos Longros Reviewed by: pouria, jlduran, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56237 (cherry picked from commit 9a4a9f623bbaf991b3ba580593d47f2ee9f7b03b) --- sbin/ping/ping6.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ping/ping6.c b/sbin/ping/ping6.c index d1f4c192b4c4..c029f7412dce 100644 --- a/sbin/ping/ping6.c +++ b/sbin/ping/ping6.c @@ -1119,21 +1119,21 @@ ping6(int argc, char *argv[]) #ifdef IPV6_RECVPKTINFO if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVPKTINFO, &optval, sizeof(optval)) < 0) - warn("setsockopt(IPV6_RECVPKTINFO)"); /* XXX err? */ + err(1, "setsockopt(IPV6_RECVPKTINFO)"); #else /* old adv. API */ if (setsockopt(srecv, IPPROTO_IPV6, IPV6_PKTINFO, &optval, sizeof(optval)) < 0) - warn("setsockopt(IPV6_PKTINFO)"); /* XXX err? */ + err(1, "setsockopt(IPV6_PKTINFO)"); #endif #endif /* USE_SIN6_SCOPE_ID */ #ifdef IPV6_RECVHOPLIMIT if (setsockopt(srecv, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &optval, sizeof(optval)) < 0) - warn("setsockopt(IPV6_RECVHOPLIMIT)"); /* XXX err? */ + err(1, "setsockopt(IPV6_RECVHOPLIMIT)"); #else /* old adv. API */ if (setsockopt(srecv, IPPROTO_IPV6, IPV6_HOPLIMIT, &optval, sizeof(optval)) < 0) - warn("setsockopt(IPV6_HOPLIMIT)"); /* XXX err? */ + err(1, "setsockopt(IPV6_HOPLIMIT)"); #endif cap_rights_clear(&rights_srecv, CAP_SETSOCKOPT);