From nobody Sat Sep 10 19:51:38 2022 X-Original-To: dev-commits-src-main@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 4MQ3Qf508rz4brgL; Sat, 10 Sep 2022 19:51:38 +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 4MQ3Qf4ZHxz3mxS; Sat, 10 Sep 2022 19:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662839498; 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=x6aBGf3kaiLEuESHGz+ziP63uI+70Mud+lQRQUG8ICc=; b=aflZM2k5btPUG5+LApC+uDLXzgS8lAaDHzjaq+rm3q+QfMdz27teRG5h/3AjLaVD8F6otx sF3l5hLYw4TU19alOpaiAwSsZtB6DxcCdTCrCT2dQuHYlolzqw4Wq0CZj9YKI6dflz7G+H fA8s+58YlPDr/DixLDKibDvOrKn2gA6srSAijggFXn/sVbTtNIwupxW2tAUKuV5MvSHmB5 NxOMOStfrFJyGNeE334NWGy3PouTgq1xtKOdPbazfRa9xUHDy++/1jeUmYCc2jsXoBHn/C K1hdkEpDnZDqrjx3wG+TZ+MK38K8UScoz5oROt1kHoZceer0J39uJNsTRM+koA== 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 4MQ3Qf3gMczPtT; Sat, 10 Sep 2022 19:51:38 +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 28AJpcTD043789; Sat, 10 Sep 2022 19:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28AJpcUE043788; Sat, 10 Sep 2022 19:51:38 GMT (envelope-from git) Date: Sat, 10 Sep 2022 19:51:38 GMT Message-Id: <202209101951.28AJpcUE043788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 3be2225fc845 - main - Remove fflag argument from getsock_cap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3be2225fc845de2fe503f0c1e49c98d6756500ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662839498; 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=x6aBGf3kaiLEuESHGz+ziP63uI+70Mud+lQRQUG8ICc=; b=prlrpI6iZOO5Kriaf8ANpebuRHICTfO+61ir/OGhSGJOsSh5T06ZTh0E17NyuB7sCD/PeL d5KFq74OLMw8e5TIlvd43DMEq3z0WZSJREBiCj2tro5i38xt3OGgI+TDHNWkW/OGMoZhYL zsah+UjuG6PLIPG6g31UNhgDVYxC81VBhQF9ia8uFYPuEfzmWishqIRGId6o6J+kDLHqWs bz0O6dYAO2o/bD3WdBsWOSfKQP7d5we7dcaxRwP4/pr6lhNEu6RqvSZXQoG+g7egeDXwYG PrHT2hOTr1MnUV/TWwu+GlS/EY/s3FPuABuyYSiarWidh/m+9BLSP61+uWJuRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662839498; a=rsa-sha256; cv=none; b=Wabpd0hQv012ChPu+IXT9uh4ZqGpI6CxRF6kSYVI46BFH3cLR70y2IlramT96JwHlwZIRO ByQmeuPxkwW1GOi/rQokF8xc4qsysCd4ZdPoZUPFqpaCl9Z5UoK9v2UGBfgzx6xqFlE3Ix q7iSNAqSuriqinzvL1yFvRhYsakgKj5vXDXR28Bflk9PLe6ivxxnTkie4pee3O3T1yIi6Z SM/jbxEZHOqdWK2TcG3GVlVfPisNkgnbd3HAXF5AnqQP9HRVhz5q6WDFcTiw2gBz90ZtX4 NRnFWW9f2SvFHPbU2PKzPyE9nGeAqBNFmDIgGyGWv4WYeUJahs9vPIsrhmLR4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3be2225fc845de2fe503f0c1e49c98d6756500ac commit 3be2225fc845de2fe503f0c1e49c98d6756500ac Author: Mateusz Guzik AuthorDate: 2022-09-10 19:45:24 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-10 19:47:47 +0000 Remove fflag argument from getsock_cap Interested callers can obtain in other own easily enough and there is no reason to branch on it. --- sys/kern/uipc_syscalls.c | 7 +++---- sys/sys/socketvar.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index c269bd09f139..c2ba9535472a 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -90,7 +90,7 @@ static int sockargs(struct mbuf **, char *, socklen_t, int); */ int getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, - struct file **fpp, u_int *fflagp, struct filecaps *havecapsp) + struct file **fpp, struct filecaps *havecapsp) { struct file *fp; int error; @@ -104,8 +104,6 @@ getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, filecaps_free(havecapsp); return (ENOTSOCK); } - if (fflagp != NULL) - *fflagp = fp->f_flag; *fpp = fp; return (0); } @@ -347,9 +345,10 @@ kern_accept4(struct thread *td, int s, struct sockaddr **name, AUDIT_ARG_FD(s); error = getsock_cap(td, s, &cap_accept_rights, - &headfp, &fflag, &fcaps); + &headfp, &fcaps); if (error != 0) return (error); + fflag = atomic_load_int(&fp->f_flag); head = headfp->f_data; if (!SOLISTENING(head)) { error = EINVAL; diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 101c6f3f4513..e46eb0520e47 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -449,7 +449,7 @@ struct uio; int getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr, size_t len); int getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, - struct file **fpp, u_int *fflagp, struct filecaps *havecaps); + struct file **fpp, struct filecaps *havecaps); int getsock(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp); void soabort(struct socket *so);