From nobody Mon Aug 21 11:41:17 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 4RTrCf0hgZz4qfsf; Mon, 21 Aug 2023 11:41:18 +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 4RTrCd5WKWz4VYr; Mon, 21 Aug 2023 11:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618077; 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=t8Fyji6FRUSqHghvNK28ZBP0x8x3itrKPOuqdyDkNrU=; b=ajfPAwjceQSr9njTJraVmZJMgb9LoJlYG6bULdjv0GhVAEJ/JO39GYB3vRAbxnjx/kZXf7 h1CxrKY9wqgptr6rXLqYWcdL60GyGYLVbqg1gOUziJEHdGulZwgEqJ33dsOYO6JAhIjXJc /bmxjyqqFGMgeZu1E1Hwyy9f6CPHdOecCtr7+5CGANJy4nVP1tdf/c5M65TYvWpUMTx514 cqEAHand1J0dIpy95DaAdCLtbJhlfZuQG42Q6ii4xG6Ha5AT8lqfeYF8roXwFZjkEBYqeN ipMkuKKM9FLxOVTYnLyA2Ovx8MtfORZSfo/BLTBu6DouasQ9hBRKCMkbkm1auw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618077; 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=t8Fyji6FRUSqHghvNK28ZBP0x8x3itrKPOuqdyDkNrU=; b=MiVXRzusfVmcwt7c6p/qYr1RYMWBWhaEAiEfQPWq5JbEeE2Svq3TcyblsxYIxHVHFbMMBQ VSs3TTSvu4AWiRSkgTE7FKiILk6D9hEQytZ3/e/aDn+F4/FwvQI7kZWuwoZ5mZL7PMjPL8 3+8PRPjfhgGLOgoQ/qG7vQjAJek/Rh7eMDqXfs443mUqIVvVo/0QZFO0Z2LF1t8F9JhOB0 Z6p3sV87lQSihPiDrODzEQpMFNS7XQNYpAFzzrZAmeC/qyei95Bc9mKpJA+jmZ/sf5FJP+ caTDUSkIw9uW0WFhJBgAs48WxGAzy70/q/zR37x5Lqvx6xxDU5tQZqMgHg0FHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618077; a=rsa-sha256; cv=none; b=Ne7Rc3mXjwYTFeap9933B6IJr4nf/rhseIemOHR+rzMBKThrL9s+/JZvJemDmxelnzxt6D qW/qXp/OumR00xEIRpmQEdtO2SS44P0tz+4YHQ0hWyTlmoPjORtA5lTTvR4IL9bShYpNlv aSN/p3j+hgPREQktllbxYSDpG9f6TJVKdDqt5G0zOchdmclZuUUYImvuMDxpeSLhZEIzP1 Z+TIuT19oryTthK0XdS13cLVhScE/LI2Fl66VxGaS1yF9Qv/zEKtcbrfrGeVnmp59vp6G0 zvoMC5LjrnUlLFM3e62ofMVNMN1SnjHqKvZ6oIZB0QG0n2qhBBhY/olf4wyj8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTrCd4cp9z4c4; Mon, 21 Aug 2023 11:41:17 +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 37LBfHAA045778; Mon, 21 Aug 2023 11:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfHeL045775; Mon, 21 Aug 2023 11:41:17 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:17 GMT Message-Id: <202308211141.37LBfHeL045775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d238be002e42 - stable/13 - linux(4): Skip unsupported anxiliary message 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d238be002e4250de80d197895ea409ef85572c95 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d238be002e4250de80d197895ea409ef85572c95 commit d238be002e4250de80d197895ea409ef85572c95 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Skip unsupported anxiliary message Instead of returning error, skip unsupported anxiliary messages and fail if no one handled. MFC after: 1 week (cherry picked from commit bbaa5523c01a11e1e322928639522b9ccfd19978) --- sys/compat/linux/linux_socket.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 063e542f9d83..7bcefcd2d81b 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1723,7 +1723,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, struct sockaddr *sa; caddr_t outbuf; void *data, *udata; - int error; + int error, skiped; error = copyin(msghdr, &l_msghdr, sizeof(l_msghdr)); if (error != 0) @@ -1789,7 +1789,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, msg->msg_control = mtod(control, struct cmsghdr *); msg->msg_controllen = control->m_len; outbuf = PTRIN(l_msghdr.msg_control); - outlen = 0; + skiped = outlen = 0; for (m = control; m != NULL; m = m->m_next) { cm = mtod(m, struct cmsghdr *); lcm->cmsg_type = bsd_to_linux_cmsg_type(p, cm->cmsg_type, @@ -1809,12 +1809,13 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, } if (lcm->cmsg_type == -1 || - cm->cmsg_level != SOL_SOCKET) { + cm->cmsg_level == -1) { LINUX_RATELIMIT_MSG_OPT2( "unsupported recvmsg cmsg level %d type %d", cm->cmsg_level, cm->cmsg_type); - error = EINVAL; - goto bad; + /* Skip unsupported messages */ + skiped++; + continue; } switch (cm->cmsg_type) { @@ -1872,6 +1873,10 @@ err: if (error != 0) goto bad; } + if (outlen == 0 && skiped > 0) { + error = EINVAL; + goto bad; + } l_msghdr.msg_controllen = outlen; out: