From nobody Wed Dec 27 04:24:53 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 4T0JT1524Tz552Yf; Wed, 27 Dec 2023 04:24:53 +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 4T0JT14Wpxz4fkV; Wed, 27 Dec 2023 04:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703651093; 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=HM3fmtIH7MvAhEDbzQOOOL3hC7EC3eIZnzzW+xODZAk=; b=Pv8kfXgqlKAOaFU5ZCGKnnH/xmN1BFc09gpb+2dWQL2Gk4D2wJyTPZui2TUxBUKw/GrIlp RjXHcMYig5LGpK10AO/+D5+SzLUTZpI7cDKAxcjHcAHWiIcHYfawj2rtp6eIq5/F6FeHwl PordIuU53yyLWa++1x8auQJsSfbOo/D7nyQ4v3alOaGiO/2Mq/obQtx+rKt+TeMgq1oQzI YohSiCLa71VZrh5DKGJD4IsxAzBxxLkSk6hGHqRwacqI5Fr2LqarpK+6PWwfjMJTN5dtC6 kmY5H+weA2BYdtgPK71qpQ38Fqy/eLK1o6X6PhzMKVqbFGqNpQ2dw2KG/baAZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703651093; a=rsa-sha256; cv=none; b=irQJMGBfdMcHiszFLR1lWhBe/wsqZ9hyJ3xogB6xrLKs+VWo2gdt3xUqCBPcYPi1L7hvyL FUxJ52CqGUl40Pprx1OFMINPA3PqTR8h6NQh5X1RVy71JcGpUvRZr0SKzAdeyOxTRshbrI /1GyzY9/TBgr8iMkOVuu5XylYCWr9REPkItZmS6552vPNVdsOi7qfbiX0v/zofJSEOoaD9 9zpS94I8te1dAsHl5q47hbAee+ymQYbqutuJA+nD7plyeTXrsFnNXRUbEzObL89EKFLiym e9K5lbxzmb+gGupzFIyDg17jVS5qPXRCcvWNUyqWFxA34k3V2cNFciPLlTwn5A== 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=1703651093; 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=HM3fmtIH7MvAhEDbzQOOOL3hC7EC3eIZnzzW+xODZAk=; b=NUMaO71gNP8o+T683t99apTSZNWPaItnQ8ydqx/QVFt6kbwbayzxMY5UsCiIh81mvzlDXN Y6QjVx1ekGH3/UWy1frouKYUnizjnuvKYqCtNeaghXVQc8F4EOEPUOCpa5Inv7f2adSEQy WyAX5/PxFeBg/HRjHjYhLXeLDp8wOaeq6TzZLjMz0oLwV944sdy4Q8zj+T36fvjYMScEWt F/yroEYjZHW5qOLXwCXQwa0e5IkXjR4TZ1mJla9bFjHtDnPDwPwsDNSWpGs3UKYFQH/CN4 7sH0SnyYqcePqCifesOEvO7UBoUeLlVzwsf2Zq8DvXgWLMLFxb+TQPG3kEXOTQ== 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 4T0JT13ctwz8wn; Wed, 27 Dec 2023 04:24:53 +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 3BR4Orqi057077; Wed, 27 Dec 2023 04:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BR4OrT3057074; Wed, 27 Dec 2023 04:24:53 GMT (envelope-from git) Date: Wed, 27 Dec 2023 04:24:53 GMT Message-Id: <202312270424.3BR4OrT3057074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f27aff8f7f4f - main - linux/netlink: don't override sopt level 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f27aff8f7f4f7628a652602e55409f7e858d7f56 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f27aff8f7f4f7628a652602e55409f7e858d7f56 commit f27aff8f7f4f7628a652602e55409f7e858d7f56 Author: Gleb Smirnoff AuthorDate: 2023-12-27 04:21:58 +0000 Commit: Gleb Smirnoff CommitDate: 2023-12-27 04:21:58 +0000 linux/netlink: don't override sopt level This override effectively prevents correct entering of netlink protocol specific pr_ctloutput in sosetopt(). Reviewed by: melifaro Differential Revision: https://reviews.freebsd.org/D42520 --- sys/compat/linux/linux_socket.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index f474ea06440a..ae22af90d443 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2117,7 +2117,6 @@ linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) name = linux_to_bsd_tcp_sockopt(args->optname); break; case SOL_NETLINK: - level = SOL_SOCKET; name = args->optname; break; default: