From nobody Tue Oct 04 21:40:35 2022 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 4MhrjJ0YHdz4dmp3; Tue, 4 Oct 2022 21:40:36 +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 4MhrjH73Kpz3M85; Tue, 4 Oct 2022 21:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664919636; 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=o+f21pnENjlnencstjDjYzNOe4cU3eh7foPzf+KDy1I=; b=WFa53Gaho+kuYfFwO/Sdani/IFRZvVsKGaaDAe9di9P/Yax7NF9P4BbPJ+troYarq8hv4q j9PiojWIoyQfy4TTuEAOpStSTZ8wMMWPbNgOV0IGu6dOgcmPhCAONSyfOmB+mt8n2FV/Gv Eca8Sr8dKDCAPqEydpRc/3c4fleqqOQQRhr97OW3mzdEABTru1FrIiKfBoW6OgNlU7t8WQ CFPVPhYGk4rH4J1pXD3hVxkD52NAsDRMcVs25xgpiDWDloA2KbUE9nTr4fz5IYkme/jNss 5LNZwo7kOJHLj8e2D+pf2jIY7lNuRlc0bh0kViOALPV5HIPGgXWzlE8YZJIu2w== 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 4MhrjH662tzhYR; Tue, 4 Oct 2022 21:40:35 +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 294LeZvx046020; Tue, 4 Oct 2022 21:40:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294LeZtm046019; Tue, 4 Oct 2022 21:40:35 GMT (envelope-from git) Date: Tue, 4 Oct 2022 21:40:35 GMT Message-Id: <202210042140.294LeZtm046019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 8ff4fc03e693 - main - traceroute6: fix capabilities for the rcv socket 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ff4fc03e6933dd69f99a8f34f2aa0760300f248 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664919636; 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=o+f21pnENjlnencstjDjYzNOe4cU3eh7foPzf+KDy1I=; b=H+YOzuO8ttCwPzPbYQ6MWHZWi8A1/OBCGSYIUmPp97ZwIuFWi+BgeAc6FadjIUhcb/RISi 4iC1JWrt9sanUNv4R64akeSC6fi6ATtrnkgwEdiGKomdukvKFBhHGxeHPteEl3ktSX5iBX 9zOQL2Wmw7JmUi82OAyzNTtLzkXg/B+EHIN9Ln1ho5Z3P37dp8NJCFNxWD0DqeixgdZvwV S1QOq38ql9MKEJFVmKHXlmT/CiyYIJfbsE8ahMr5YogRpKEbOX+Rs+UHBQsSfamvKLHCaX C/PNtChXW1LzE7CzU463iSp+5E38aGXmnibOua1/XyoxbfeAC6Ze0x5wr3Hopg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664919636; a=rsa-sha256; cv=none; b=LZlUtG4ym7rQIV36YaxIcixVn2Gb/ZZ+NwPP/wqL6phwsSYal6QdjVGlMbLL/h7HtX3iKA xHgHL84K+qVXlqDd6N3ZYEDAhd6d+J9uqREsfu7JF32EZ2Rg8nCuZUbmClIKCGikN322mK T3JQLzkF2kdaWX2IVl71+aXhldtmraJbqwcO4wTs2HUYfSaTv71NIJkOlrtSQLGPZfVuy2 20ZjwrdNMzDOeh8YpL/xEsJyNzMOdxwdHaev0GfwrspU6FFbE4oNv5xGgCKGiN41ZUOYCb E7pK41CS1ay74fQOtMc4D9f5JMcFEEdENDttTe91yvSSheUybCa30I5sDsvD6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=8ff4fc03e6933dd69f99a8f34f2aa0760300f248 commit 8ff4fc03e6933dd69f99a8f34f2aa0760300f248 Author: Michael Tuexen AuthorDate: 2022-10-04 21:34:58 +0000 Commit: Michael Tuexen CommitDate: 2022-10-04 21:40:29 +0000 traceroute6: fix capabilities for the rcv socket On the receive socket, recvmsg() and poll()/select() is called. Therefore, CAP_EVENT is needed in addition to CAP_RECV.. While there, check the socket for readbility before calling recvmsg(). Reviewed by: markj@ MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D36878 --- usr.sbin/traceroute6/traceroute6.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index a071c084ad07..d887acf5ae53 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -937,7 +937,7 @@ main(int argc, char *argv[]) strerror(errno)); exit(1); } - cap_rights_init(&rights, CAP_RECV); + cap_rights_init(&rights, CAP_RECV, CAP_EVENT); if (caph_rights_limit(rcvsock, &rights) < 0) { fprintf(stderr, "caph_rights_limit rcvsock: %s\n", strerror(errno)); @@ -1039,7 +1039,8 @@ wait_for_reply(int sock, struct msghdr *mhdr) pfd[0].events = POLLIN; pfd[0].revents = 0; - if (poll(pfd, 1, waittime * 1000) > 0) + if (poll(pfd, 1, waittime * 1000) > 0 && + pfd[0].revents & POLLIN) cc = recvmsg(rcvsock, mhdr, 0); return (cc);