From nobody Fri Jun 17 19:39:09 2022 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 2A79985BE22; Fri, 17 Jun 2022 19:39:10 +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 4LPq9T4MZnz3R00; Fri, 17 Jun 2022 19:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494750; 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=+1AkZeS6vjc/Ioyg02Oxl/FP40N1N1ZdzGkmNFNYVHM=; b=wGTpmg0uj6LGkF+2Lr2XUMl38F+cLAYuTz4p5nalU+1CU4NtPJAZqLMf79vXCdRVOBcppO OSY+98Ii8UKyHzpN6KYDKan1x9SR01p5OM4C9JkP2zT58ca9V5XXnb7I0PdM/WcOBpaVJh fU7TCM+FzE1QDta4IxE0r57MRcZ709q1fP+AB3EiTK4C9blAuDvOia87tOJWzAx/3f7m+3 JXCxYI0fe2DRDnU61L47M48C2UT1dLtEL/SBYKFgCZj5NhoOzlmH6hOCqkvss6zwfa5AWQ NwdOW4C612nBMpImZzw9uAFItKVGXktb8Nl20YJL7QH6FmF1GV6PxApTf0+3nw== 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 6F55025C97; Fri, 17 Jun 2022 19:39:09 +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 25HJd9C5015631; Fri, 17 Jun 2022 19:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJd9XA015630; Fri, 17 Jun 2022 19:39:09 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:09 GMT Message-Id: <202206171939.25HJd9XA015630@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: c3dfbacbe9d3 - stable/13 - linux(4): Copyout actual size of addr to the user space in accept(). 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: c3dfbacbe9d3474859c3ed50eabd5b026280c43f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494750; 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=+1AkZeS6vjc/Ioyg02Oxl/FP40N1N1ZdzGkmNFNYVHM=; b=H/FyWITSfQBcg6BB7h5weW9t5VwxnhGnMjnB1ioJfiyLHwMXq7Q44OiZW8h8XLj16S2y7U +7I8SG5RDP/EJGcft4p1Of9aEf2iSmjPwfr8qguvmpjKzLZkwn4ync2xEyYxT1r40kiz1Z cMjMNCSGChuRDntNVyJMd5+TrzMFgN2fC0A9hZnf2SpTqMoRsf5KRO1jKd5VflkQTcZZm9 8m47uk+6OkA3pny4Xd3Pztfn1bz4eWaI3WBPqCvA3YYCttpm190aqltxXCm0/RoXsPrM0u ZuJYdhvByzY73KVyC218nEqJeHdDhchRiYrmnyksyj/Z8xRop8EMtBZUHQHLIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494750; a=rsa-sha256; cv=none; b=RQ3e5/btXAF5/cz2CYi2nmQ/xoL+aOgU66cndBsFt46KiuVqEJFzTXUslH9dgrOyJMKPOU kWexIteiqHmpW0n/0vaHx5N+kJPzg7xkZdqPUfpvflHlzlALPD0WDmmTVTldYVaGhMjnvQ JoRZMvq6K65PeLNLURBwxUqVAU5Gp1v1eMDtT8+RL9Xj52VfTYAb4fTjYvVNV7a49Mpdt5 r2Hs91LIdc8LiV6+QwhpRshhDRJ7c23kjUeodta0mdenH8Wq9WKIcjRBNOst3O6hUVlMEL Rn3qrAytzhyzjHcMAkgN5efMbzwGMUDzhFCfHcSFC33P4sSgY5dpkvLP3D+kMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c3dfbacbe9d3474859c3ed50eabd5b026280c43f commit c3dfbacbe9d3474859c3ed50eabd5b026280c43f Author: Dmitry Chagin AuthorDate: 2022-04-11 20:33:27 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:52 +0000 linux(4): Copyout actual size of addr to the user space in accept(). Differential Revision: https://reviews.freebsd.org/D34727 (cherry picked from commit 673bce11cedde3cc33c154d2b8e2d41139dcef72) --- sys/compat/linux/linux_socket.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 622e25651dbb..d7e17596fde1 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1046,11 +1046,9 @@ linux_accept_common(struct thread *td, int s, l_uintptr_t addr, if (len != 0) { error = linux_copyout_sockaddr(sa, PTRIN(addr), len); - - /* - * XXX: We should also copyout the len, shouldn't we? - */ - + if (error == 0) + error = copyout(&len, PTRIN(namelen), + sizeof(len)); if (error != 0) { fdclose(td, fp, td->td_retval[0]); td->td_retval[0] = 0;