From nobody Tue Apr 23 04:52:44 2024 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 4VNqVh4MqCz5JQm5; Tue, 23 Apr 2024 04:52:44 +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 4VNqVh3Lf6z4YXc; Tue, 23 Apr 2024 04:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713847964; 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=pxeeLsoe2xrDhbzWH4b2AmReqOmx74ZXu2sf5m7vRjc=; b=U3YqDxuM5sD3Cf86Re2RoiIyMEXlNim/G/0eh/UKcYUtAd81qMTj2cScjTsVQM9v4gLrOi 4KQ6p8tvbYjIgS09T10wscPY/CyzdsTNygnWnsU1rKnSgVkINsgNjeWqGlOJoM6nrFxhRb /wLkANkPohVQygJEnzmqGmYSgpXQOFblqcfARvOkUOsz/yUOjE4DCJOXk5eu5gksm6K3W/ b5dqN7T+e7FGa+FXZAmYoqx6E0ViYkv5LsThvMQgCRhh/JgvCx6OhekTRPNDo4DNngKOWB 9AooQGXVTvGEsu2u14rzaytIapqQ40Rce3YgjmWomdi58CCfvJta96h71Ir4AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713847964; a=rsa-sha256; cv=none; b=nAZ5ApN696etgKBH/kOykNRWRZptSYIoYpqkiSzkuYjQOalu0kln/WcrAUndNSZJqaTtRs Qd7yD53OEg6XNkr7mEUut5Lgxek434s+9XfrsGZV2fZUOOl+WIQacstpEqZv/0lkNCVgOf sCdfOGaoRS/l9K6m0WBX2Usby6gsVs96LASu/S74QFOpbI3BDTZEc0ZNMc+wPFrljdODxI 3045OVXutNgSlXXcRYHfnHQaN3no5wKFRFT1V/8Sq1Z781HEtYwO1ro5VEavkpTes+BQy+ 1e3RkdQvliJsfHd/rwrhFfSfkHYCjYaToahx4bm0/CnwGXMudFk8sS1YjKEkXw== 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=1713847964; 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=pxeeLsoe2xrDhbzWH4b2AmReqOmx74ZXu2sf5m7vRjc=; b=wsqSwIpI4dSnGSw96YlLs3qTIK1YUGHXav0ri+7pmQ7JnfqwvA9uV+cTISXxvgZniZrQfb a2+nuEMEfYmf/tnCkaXqlgCk2NefQ6hGnqDXKWteSHya3EObC+iGy61Vxbbjz9RuXZ9Hvr y1d/5T6cnmKTJmz5MY4MrDEGZrYOIafdvUVJe6oP07NHCK+cJvWtaMP9S4NcHBjc03axtv zpLc7tHr+G21PzW8uuq4dyIQvd3CPJkBURAd06zel7C6oXSp+Ic+FA3h0N1GgX7FN0iat/ qMNBah/lgBlaI7R1PshmpvXrgYrwxDwukcAtrJj4M64telb2n8WVraA4ZYodcg== 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 4VNqVh2x0czJBZ; Tue, 23 Apr 2024 04:52:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N4qit5063720; Tue, 23 Apr 2024 04:52:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N4qiLN063717; Tue, 23 Apr 2024 04:52:44 GMT (envelope-from git) Date: Tue, 23 Apr 2024 04:52:44 GMT Message-Id: <202404230452.43N4qiLN063717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ca63710d3668 - main - linux: ignore setsockopt(IPV6_RECVERR) 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca63710d3668cf6f3cb4faf065d8b4eeffa028ad Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ca63710d3668cf6f3cb4faf065d8b4eeffa028ad commit ca63710d3668cf6f3cb4faf065d8b4eeffa028ad Author: Lexi Winter AuthorDate: 2024-04-22 21:58:11 +0000 Commit: Warner Losh CommitDate: 2024-04-23 04:36:34 +0000 linux: ignore setsockopt(IPV6_RECVERR) Under Linux, the socket options IP_RECVERR and IPV6_RECVERR are used to receive socket errors via a dedicated 'error queue' which can be retrieved via recvmsg(). FreeBSD does not support this functionality. For IPv4, the sysctl compat.linux.ignore_ip_recverr can be set to 1 to silently ignore attempts to set IP_RECVERR and return success to the application, which is wrong, but is required for (among other things) a functional DNS client in recent versions of glibc. Add support for ignoring IPV6_RECVERR, controlled by the same sysctl. This fixes DNS in Linux when using IPv6 resolvers. Reviewed by: imp, Jose Luis Duran Pull Request: https://github.com/freebsd/freebsd-src/pull/1118 --- sys/compat/linux/linux_socket.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 1e578982fced..36cffc979802 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -501,6 +501,11 @@ linux_to_bsd_ip6_sockopt(int opt) "unsupported IPv6 socket option IPV6_RECVFRAGSIZE (%d)", opt); return (-2); + case LINUX_IPV6_RECVERR: + LINUX_RATELIMIT_MSG_OPT1( + "unsupported IPv6 socket option IPV6_RECVERR (%d), you can not get extended reliability info in linux programs", + opt); + return (-2); /* unknown sockopts */ default: @@ -2112,6 +2117,14 @@ linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) name = linux_to_bsd_ip_sockopt(args->optname); break; case IPPROTO_IPV6: + if (args->optname == LINUX_IPV6_RECVERR && + linux_ignore_ip_recverr) { + /* + * XXX: This is a hack to unbreak DNS resolution + * with glibc 2.30 and above. + */ + return (0); + } name = linux_to_bsd_ip6_sockopt(args->optname); break; case IPPROTO_TCP: