From nobody Mon Aug 21 11:41:16 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 4RTrCc5R6sz4qffn; Mon, 21 Aug 2023 11:41:16 +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 4RTrCc4ZXtz4VVY; Mon, 21 Aug 2023 11:41:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618076; 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=/uOGRUCaDlU7CRHKpgtDWHAP0sDCxcP9nTAQFDwpSVM=; b=jzKlQbcsto1PcKLNtVbf70w24AqKU1JBd7botwWgEntKn5UUBsyFiTT9zcAFVbu55dHvab elzfBVnVJg5NxPKr85YgWUCviic8uJhvWIzr+xWkQ4l+w0Udq0eDt8w6BoOLqZ2xNMv2bv ySZWfcYqO8SOJX8GWF6T1uvTYFWARlFHlvPEQFIXFEnhmDAtBpHNIAiYAW5u8bcm1f5qMT 7K4zgAa9o+naZasobK7ToM0iVkl1JcrkqeNQhNypHkPTJ76gH+iLEqdk+3RyP5QnYs0h2l vCnmISHeMurtgc2QZiShTokVzd23qqU9qTuiW39lEovRNktCiHtDKNAz9fAEEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618076; 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=/uOGRUCaDlU7CRHKpgtDWHAP0sDCxcP9nTAQFDwpSVM=; b=AGP7sq8p0BbjcsN1YaiuWlty/E3Cel1sCi1fmtiT5TRWbzZyRmDzFYulXCk99Bp4X+D9E8 Yu4aRd6XWbt2LSg8PcHcovzBIGR/wOTe+VbPf7A6Nj1rY+7LLPgp+8Sl8tUoMakkUbXrB6 RGlOZx/QJzRPN56FespXiLNFCUZRYqPxXId3G5NzGgNfm4Ta5QBGj+FCQ2xSZwN7iH6AOK NzWeUH+lfxPpNRibnpxDgoaaK+eFnJNmriV7EmlcC3s0dU2ZfxmEnD3CB8vV0XA6CCw+yf //YhL8ghFmPsxpaBOX+agHi1g7DIm0z3vG+AT9ibOpjLn14OM4YLesSvEeUevw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618076; a=rsa-sha256; cv=none; b=d6j2wTDrPYUZ82LcOmQvZBl54aUcX6gJIx1aEeOTlRBIzTfO1LzNZETD/i6OHOiVxX/C0e uYJUBcbfdT6Dd2o00bGAZP9LfV4Ax4z58Bqhw1LCtr/lvzrURgXvgIgOP/2fbHS8+aNmpl pmAvpZwXuK+DhHThyZv6Nh7ZDlL3YLRuDDLoXwL4ALXg6nzy2q5QOlPcSioXtAClyfVzKr WmOyeynOUzv4uH9I287n+STWzuDEzUwx6x///q5ijgqV0IEyCFzXN8wU4CXLoxCA7IU1Th mN2XdXl2uuh99uFWDL0+hbeWl6CcG4498KAKTK8iB4vXa8GXHvhSwViVDldwOA== 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 4RTrCc3ftfz4Yw; Mon, 21 Aug 2023 11:41:16 +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 37LBfG4K045729; Mon, 21 Aug 2023 11:41:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfGh4045726; Mon, 21 Aug 2023 11:41:16 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:16 GMT Message-Id: <202308211141.37LBfGh4045726@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: 2b5f7b77a871 - stable/13 - linux(4): Improve readability of recvmsg control buffer copyout code 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: 2b5f7b77a87100fcd19fb2bfab55cea2cbe920e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2b5f7b77a87100fcd19fb2bfab55cea2cbe920e3 commit 2b5f7b77a87100fcd19fb2bfab55cea2cbe920e3 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Improve readability of recvmsg control buffer copyout code MFC after: 1 week (cherry picked from commit a21238d843ebe02e696cdc30b008382dfca5612e) --- sys/compat/linux/linux_socket.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 076be5aef2c0..063e542f9d83 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1861,10 +1861,9 @@ cont: lcm->cmsg_len = LINUX_CMSG_LEN(datalen); error = copyout(lcm, outbuf, L_CMSG_HDRSZ); if (error == 0) { - outbuf += L_CMSG_HDRSZ; - error = copyout(data, outbuf, datalen); + error = copyout(data, LINUX_CMSG_DATA(outbuf), datalen); if (error == 0) { - outbuf += LINUX_CMSG_ALIGN(datalen); + outbuf += LINUX_CMSG_SPACE(datalen); outlen += LINUX_CMSG_SPACE(datalen); } }