From nobody Mon Nov 29 22:05:29 2021 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 BDFBD18C7992; Mon, 29 Nov 2021 22:05:31 +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 4J2ztf3Qhcz3G5d; Mon, 29 Nov 2021 22:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 185762598; Mon, 29 Nov 2021 22:05:30 +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 1ATM5UJ8075585; Mon, 29 Nov 2021 22:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATM5TQZ075584; Mon, 29 Nov 2021 22:05:29 GMT (envelope-from git) Date: Mon, 29 Nov 2021 22:05:29 GMT Message-Id: <202111292205.1ATM5TQZ075584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ba4e5253a38e - main - syscalls: normalize orecvfrom and ogetsockname 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba4e5253a38e13ff14ac25fbef98b24be179d529 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638223530; 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=ZExUDx3Z8Pzqar22GvD9MgwPZwN/5eCc5oyU+HavgdY=; b=BqxYerS9PYRuLz5bQmiRkOBJNsFsP5OCMg0LMIWVsBHrCnW9ZfLDRqTdwhkYiCkzJhicna H/E/f9n15K5YtIHsBtC7sW+0Am8NMBfHpzWU++jS2ucaj05Gm+7fTb3myJlI53tdBs/ZBA zn4jM2lCUpDXsfeu+ntuk2wLKhAwc/IGyLOeth9R4ib7wcVx3TIc1O9hfQ12l1nszZLt1j ef/GYgl8Fht7+5Vwffx0misu8zZ6l6EzFHWubI7ycsO6NAsTz3U8/0iFXYea+/jSo20i+d ukXDbqR/l9EaNpNHm7dgm/dv4UOMkPKUuDt9Bho3p0z49ut3gHFRbw6R+2Wf1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638223530; a=rsa-sha256; cv=none; b=gqx7vWu4K7nT6LEWYTRxcVXkr7FSSEP4JRxZqB+n8xKIxUhPNxKnCmpnShDUN5tpSYEotG zezPfGRfbcNYopiMDmL9wKFUIBsy5XEOle9F2M9MPOWv5+TncaxmVeTiSYa/O5GgTpy98U OBM1uGFdTuVpw6vblZuOqJdUuQBWmhgI4dzHuN7TloG5dxZrvBwxzF/cvDu4eCtx76Bf4k D4UQ5Y2qlpI186YzRUm2+Ou+kuwr8AYeCm8wdfUnY/f3Wkj+FlMRlf2u1CzXQkfXWirNYM NnA149zXuCKCTmbQGpwh15wEHW5WcbGlPTxVkuXfS1ndwgmGEHQxlERWJKRyGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ba4e5253a38e13ff14ac25fbef98b24be179d529 commit ba4e5253a38e13ff14ac25fbef98b24be179d529 Author: Brooks Davis AuthorDate: 2021-11-29 22:02:59 +0000 Commit: Brooks Davis CommitDate: 2021-11-29 22:04:42 +0000 syscalls: normalize orecvfrom and ogetsockname Declare o_args rather than reusing the equivalent _args structs. Avoiding the addition of a new type isn't worth the gratutious differences. Reviewed by: kib, imp --- sys/kern/syscalls.master | 10 +++++----- sys/kern/uipc_syscalls.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index a989d7f5f9b6..6e89f2c313ea 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -816,7 +816,7 @@ mode_t mode ); } -125 AUE_RECVFROM COMPAT|NOARGS|CAPENABLED { +125 AUE_RECVFROM COMPAT|CAPENABLED { int recvfrom( int s, _Out_writes_(len) void *buf, @@ -825,7 +825,7 @@ _Out_writes_bytes_(*fromlenaddr) struct sockaddr *from, _Inout_ __socklen_t *fromlenaddr ); - } recvfrom recvfrom_args int + } 126 AUE_SETREUID STD|CAPENABLED { int setreuid( int ruid, @@ -963,13 +963,13 @@ 149 AUE_O_QUOTA COMPAT { int quota(void); } -150 AUE_GETSOCKNAME COMPAT|NOARGS|CAPENABLED { +150 AUE_GETSOCKNAME COMPAT|CAPENABLED { int getsockname( - int fdec, + int fdes, _Out_writes_bytes_(*alen) struct sockaddr *asa, _Inout_ __socklen_t *alen ); - } getsockname getsockname_args int + } 151-153 AUE_NULL RESERVED ; 154 is initialised by the NLM code, if present. 154 AUE_NULL NOSTD { diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 3111ce7e16e4..0e083e058916 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1103,7 +1103,7 @@ sys_recvfrom(struct thread *td, struct recvfrom_args *uap) #ifdef COMPAT_OLDSOCK int -orecvfrom(struct thread *td, struct recvfrom_args *uap) +orecvfrom(struct thread *td, struct orecvfrom_args *uap) { return (kern_recvfrom(td, uap->s, uap->buf, uap->len, uap->flags | MSG_COMPAT, uap->from, uap->fromlenaddr)); @@ -1411,7 +1411,7 @@ sys_getsockname(struct thread *td, struct getsockname_args *uap) #ifdef COMPAT_OLDSOCK int -ogetsockname(struct thread *td, struct getsockname_args *uap) +ogetsockname(struct thread *td, struct ogetsockname_args *uap) { return (user_getsockname(td, uap->fdes, uap->asa, uap->alen, true)); }