From nobody Mon Apr 11 20:33:40 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 41B2111E0BFF; Mon, 11 Apr 2022 20:33:41 +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 4KcgYK0N17z3R9t; Mon, 11 Apr 2022 20:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649709221; 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=fZ7ii0MXQs5mcrLTfnib3TxYxd/wZTnjmCfUjV/t8QU=; b=QqigLqG1ERn3aaYd1kuzWST9IhKRTMQA8KR3SYgGGY4+1G+IYmdMc2S3wllFKjrZuhFJeO mF960eeGNxhlKQYVq9p2+SfF+KsOF/Al1FTtzVSAt0bDEZ3/ngOGOAqFdHGjFznEzowoYp ylMDOEbu3i+ZyVClU/CzTOq52viZwpX1SlyHqb02S8wCDbGJ2aGrNA/0aVeSAgZlUfhgHP gR8qaFHiFvJv1zLk/DWsRogUr7CSieL7N+XVU2exvR+bSv3EiW1S3kItd4uNJId3MTZQ4x 7quFcAkEHq0AxpDPp95e8RWIU6g0nWbnHknnV9NJMTEjqSajO7DKVxPeCtDVRw== 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 DE19E1865; Mon, 11 Apr 2022 20:33:40 +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 23BKXek1083130; Mon, 11 Apr 2022 20:33:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BKXea0083129; Mon, 11 Apr 2022 20:33:40 GMT (envelope-from git) Date: Mon, 11 Apr 2022 20:33:40 GMT Message-Id: <202204112033.23BKXea0083129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 673bce11cedd - main - 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/main X-Git-Reftype: branch X-Git-Commit: 673bce11cedde3cc33c154d2b8e2d41139dcef72 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649709221; 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=fZ7ii0MXQs5mcrLTfnib3TxYxd/wZTnjmCfUjV/t8QU=; b=fWJYqSymPDPme4u76uKtjoF/+wkw0kphDNL/kEgRxn+DtmhryyA90obKnWJEHjAmXDqrDE 2VJ6HO+GDBMUhVQCTQmZ6dtzrxSkQGER4BcwLgiLnNHRbkjc6oqPAWdGBR7rcttdrGQvfw 2HOTzhEbNNgT8dZzAYI+es/Ml9N5GRX6r2UwydH/K/MztkwQVcuky1m6Z5UGz38awCbOLR 8eMYtNURo55j2XtBlBWNxybsxeDInNI+aXWFhjFJYteNTyGBYOcerm0tyFjf98Dj+epmQu mkw05J9KgQAiW/lKNWmlW2SaBgqrIjAX+Pt9DYk5uyJbr666NC0iTbk4EmW8aQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649709221; a=rsa-sha256; cv=none; b=euYSgerF5rvxn3w4Ac098aCNj3NqyNW93bDSQGJ/XVEcRVLjrzT0F6yttFoC7BSx7KHVxG hPuwmpz42sqhE78kUoRDa4XTZShIXqh8RZ/CtZKYx/Hans9KLe00rFnrZD79kX8MfikidD 59XnKyCj1CyEForEfZTCZJpVShT/8io+NH/GLCWHJv6x/UySMiiJHS4yMUGFlOaXs7MJnK 0+Mft3nJAX+crKPzK8NnJiIVdAl9kWcbOjEshw3HJc66g3QxrURPz4t9to0iog6hi6nZew CzDfWYqcxw2m7EGFJS46eMN9DoNsbP9Cz8xIJ2zF7L8qJLR2mr6emO13aaFspg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=673bce11cedde3cc33c154d2b8e2d41139dcef72 commit 673bce11cedde3cc33c154d2b8e2d41139dcef72 Author: Dmitry Chagin AuthorDate: 2022-04-11 20:33:27 +0000 Commit: Dmitry Chagin CommitDate: 2022-04-11 20:33:27 +0000 linux(4): Copyout actual size of addr to the user space in accept(). Differential Revision: https://reviews.freebsd.org/D34727 --- 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;