From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Christoph Hellwig <hch@lst.de>
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>,
Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Vlad Yasevich <vyasevich@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
Jon Maloy <jmaloy@redhat.com>, Ying Xue <ying.xue@windriver.com>,
drbd-dev@lists.linbit.com, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org,
linux-nvme@lists.infradead.org, target-devel@vger.kernel.org,
linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org,
cluster-devel@redhat.com, ocfs2-devel@oss.oracle.com,
netdev@vger.kernel.org, linux-sctp@vger.kernel.org,
ceph-devel@vger.kernel.org, rds-devel@oss.oracle.com,
linux-nfs@vger.kernel.org
Subject: [Ocfs2-devel] [PATCH 32/33] sctp: add sctp_sock_get_primary_addr
Date: Wed, 13 May 2020 15:03:02 -0300 [thread overview]
Message-ID: <20200513180302.GC2491@localhost.localdomain> (raw)
In-Reply-To: <20200513062649.2100053-33-hch@lst.de>
On Wed, May 13, 2020 at 08:26:47AM +0200, Christoph Hellwig wrote:
> Add a helper to directly get the SCTP_PRIMARY_ADDR sockopt from kernel
> space without going through a fake uaccess.
Same comment as on the other dlm/sctp patch.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/dlm/lowcomms.c | 11 +++-----
> include/net/sctp/sctp.h | 1 +
> net/sctp/socket.c | 57 +++++++++++++++++++++++++----------------
> 3 files changed, 39 insertions(+), 30 deletions(-)
>
> diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
> index 6fa45365666a8..46d2d71b62c57 100644
> --- a/fs/dlm/lowcomms.c
> +++ b/fs/dlm/lowcomms.c
> @@ -855,10 +855,9 @@ static int tcp_accept_from_sock(struct connection *con)
> static int sctp_accept_from_sock(struct connection *con)
> {
> /* Check that the new node is in the lockspace */
> - struct sctp_prim prim;
> + struct sctp_prim prim = { };
> int nodeid;
> - int prim_len, ret;
> - int addr_len;
> + int addr_len, ret;
> struct connection *newcon;
> struct connection *addcon;
> struct socket *newsock;
> @@ -876,11 +875,7 @@ static int sctp_accept_from_sock(struct connection *con)
> if (ret < 0)
> goto accept_err;
>
> - memset(&prim, 0, sizeof(struct sctp_prim));
> - prim_len = sizeof(struct sctp_prim);
> -
> - ret = kernel_getsockopt(newsock, IPPROTO_SCTP, SCTP_PRIMARY_ADDR,
> - (char *)&prim, &prim_len);
> + ret = sctp_sock_get_primary_addr(con->sock->sk, &prim);
> if (ret < 0) {
> log_print("getsockopt/sctp_primary_addr failed: %d", ret);
> goto accept_err;
> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
> index b505fa082f254..c98b1d14db853 100644
> --- a/include/net/sctp/sctp.h
> +++ b/include/net/sctp/sctp.h
> @@ -618,5 +618,6 @@ static inline bool sctp_newsk_ready(const struct sock *sk)
> int sctp_setsockopt_bindx(struct sock *sk, struct sockaddr *kaddrs,
> int addrs_size, int op);
> void sctp_sock_set_nodelay(struct sock *sk, bool val);
> +int sctp_sock_get_primary_addr(struct sock *sk, struct sctp_prim *prim);
>
> #endif /* __net_sctp_h__ */
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 64c395f7a86d5..39bf8090dbe1e 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -6411,6 +6411,35 @@ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
> return err;
> }
>
> +static int __sctp_sock_get_primary_addr(struct sock *sk, struct sctp_prim *prim)
> +{
> + struct sctp_association *asoc;
> +
> + asoc = sctp_id2assoc(sk, prim->ssp_assoc_id);
> + if (!asoc)
> + return -EINVAL;
> + if (!asoc->peer.primary_path)
> + return -ENOTCONN;
> +
> + memcpy(&prim->ssp_addr, &asoc->peer.primary_path->ipaddr,
> + asoc->peer.primary_path->af_specific->sockaddr_len);
> +
> + sctp_get_pf_specific(sk->sk_family)->addr_to_user(sctp_sk(sk),
> + (union sctp_addr *)&prim->ssp_addr);
> + return 0;
> +}
> +
> +int sctp_sock_get_primary_addr(struct sock *sk, struct sctp_prim *prim)
> +{
> + int ret;
> +
> + lock_sock(sk);
> + ret = __sctp_sock_get_primary_addr(sk, prim);
> + release_sock(sk);
> + return ret;
> +}
> +EXPORT_SYMBOL(sctp_sock_get_primary_addr);
> +
> /* 7.1.10 Set Primary Address (SCTP_PRIMARY_ADDR)
> *
> * Requests that the local SCTP stack use the enclosed peer address as
> @@ -6421,35 +6450,19 @@ static int sctp_getsockopt_primary_addr(struct sock *sk, int len,
> char __user *optval, int __user *optlen)
> {
> struct sctp_prim prim;
> - struct sctp_association *asoc;
> - struct sctp_sock *sp = sctp_sk(sk);
> + int ret;
>
> if (len < sizeof(struct sctp_prim))
> return -EINVAL;
> -
> - len = sizeof(struct sctp_prim);
> -
> - if (copy_from_user(&prim, optval, len))
> + if (copy_from_user(&prim, optval, sizeof(struct sctp_prim)))
> return -EFAULT;
>
> - asoc = sctp_id2assoc(sk, prim.ssp_assoc_id);
> - if (!asoc)
> - return -EINVAL;
> -
> - if (!asoc->peer.primary_path)
> - return -ENOTCONN;
> -
> - memcpy(&prim.ssp_addr, &asoc->peer.primary_path->ipaddr,
> - asoc->peer.primary_path->af_specific->sockaddr_len);
> -
> - sctp_get_pf_specific(sk->sk_family)->addr_to_user(sp,
> - (union sctp_addr *)&prim.ssp_addr);
> + ret = __sctp_sock_get_primary_addr(sk, &prim);
> + if (ret)
> + return ret;
>
> - if (put_user(len, optlen))
> + if (put_user(len, optlen) || copy_to_user(optval, &prim, len))
> return -EFAULT;
> - if (copy_to_user(optval, &prim, len))
> - return -EFAULT;
> -
> return 0;
> }
>
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-05-13 18:03 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 6:26 [Ocfs2-devel] remove kernel_setsockopt and kernel_getsockopt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 01/33] net: add sock_set_reuseaddr Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 02/33] net: add sock_set_linger Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 03/33] net: add sock_set_priority Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 04/33] net: add sock_set_sndtimeo Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 05/33] net: add sock_bindtoindex Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 06/33] net: add sock_set_timestamps Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 07/33] net: add sock_set_keepalive Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 08/33] net: add sock_set_rcvbuf Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 09/33] net: add sock_set_reuseport Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 10/33] tcp: add tcp_sock_set_cork Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 11/33] tcp: tcp_sock_set_nodelay Christoph Hellwig
2020-05-13 12:51 ` Jason Gunthorpe
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 12/33] tcp: add tcp_sock_set_quickack Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 13/33] tcp: add tcp_sock_set_syncnt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 14/33] tcp: add tcp_sock_set_user_timeout Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 15/33] tcp: add tcp_sock_set_keepidle Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 16/33] tcp: add tcp_sock_set_keepintvl Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 17/33] tcp: add tcp_sock_set_keepcnt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 18/33] ipv4: add ip_sock_set_tos Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 19/33] ipv4: add ip_sock_set_freebind Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 20/33] ipv4: add ip_sock_set_recverr Christoph Hellwig
2020-05-13 21:00 ` Joe Perches
2020-05-14 10:30 ` Christoph Hellwig
2020-05-14 11:51 ` Joe Perches
2020-05-20 14:18 ` Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 21/33] ipv4: add ip_sock_set_mtu_discover Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 22/33] ipv6: add ip6_sock_set_v6only Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 23/33] ipv6: add ip6_sock_set_recverr Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 25/33] ipv6: add ip6_sock_set_recvpktinfo Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 26/33] sctp: lift copying in addrs into sctp_setsockopt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 27/33] sctp: export sctp_setsockopt_bindx Christoph Hellwig
2020-05-13 18:00 ` Marcelo Ricardo Leitner
2020-05-14 6:28 ` Christoph Hellwig
2020-05-14 8:23 ` David Laight
2020-05-14 10:40 ` [Ocfs2-devel] is it ok to always pull in sctp for dlm, was: " Christoph Hellwig
2020-05-14 14:24 ` David Teigland
2020-05-15 15:20 ` [Ocfs2-devel] " David Howells
2020-05-15 15:24 ` Christoph Hellwig
2020-05-16 15:21 ` David Laight
2020-05-16 15:11 ` David Laight
2020-05-16 15:36 ` Matthew Wilcox
2020-05-17 8:48 ` David Laight
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 28/33] sctp: add sctp_sock_set_nodelay Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 29/33] rxrpc_sock_set_min_security_level Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 30/33] tipc: call tsk_set_importance from tipc_topsrv_create_listener Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 31/33] net: remove kernel_setsockopt Christoph Hellwig
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 32/33] sctp: add sctp_sock_get_primary_addr Christoph Hellwig
2020-05-13 18:03 ` Marcelo Ricardo Leitner [this message]
2020-05-14 9:51 ` David Laight
2020-05-14 12:30 ` David Laight
2020-05-14 13:27 ` David Laight
2020-05-13 6:26 ` [Ocfs2-devel] [PATCH 33/33] net: remove kernel_getsockopt Christoph Hellwig
2020-05-13 13:13 ` [Ocfs2-devel] [PATCH 29/33] rxrpc_sock_set_min_security_level David Howells
2020-05-14 10:29 ` Christoph Hellwig
2020-05-15 15:13 ` David Howells
2020-05-13 13:17 ` [Ocfs2-devel] [PATCH 21/33] ipv4: add ip_sock_set_mtu_discover David Howells
2020-05-14 6:26 ` Christoph Hellwig
2020-05-15 15:15 ` David Howells
2020-05-13 13:24 ` [Ocfs2-devel] [PATCH 20/33] ipv4: add ip_sock_set_recverr David Howells
2020-05-13 13:25 ` [Ocfs2-devel] [PATCH 23/33] ipv6: add ip6_sock_set_recverr David Howells
2020-05-13 13:27 ` [Ocfs2-devel] [PATCH 06/33] net: add sock_set_timestamps David Howells
2020-05-13 17:38 ` [Ocfs2-devel] remove kernel_setsockopt and kernel_getsockopt Joe Perches
2020-05-14 6:27 ` Christoph Hellwig
2020-05-14 8:29 ` David Laight
2020-05-14 10:18 ` Christoph Hellwig
2020-05-14 10:26 ` David Laight
2020-05-14 10:34 ` 'Christoph Hellwig'
2020-05-14 11:11 ` David Laight
2020-05-14 19:35 ` Matthew Wilcox
2020-05-14 20:03 ` David Miller
2020-05-15 8:14 ` David Laight
2020-05-14 19:57 ` David Miller
2020-05-13 18:45 ` Sagi Grimberg
2020-05-13 19:12 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200513180302.GC2491@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=ceph-devel@vger.kernel.org \
--cc=cluster-devel@redhat.com \
--cc=davem@davemloft.net \
--cc=drbd-dev@lists.linbit.com \
--cc=edumazet@google.com \
--cc=hch@lst.de \
--cc=jmaloy@redhat.com \
--cc=kuba@kernel.org \
--cc=kuznet@ms2.inr.ac.ru \
--cc=linux-afs@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=rds-devel@oss.oracle.com \
--cc=target-devel@vger.kernel.org \
--cc=vyasevich@gmail.com \
--cc=ying.xue@windriver.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).