From: Christoph Hellwig <hch@lst.de>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: 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>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.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: [PATCH 26/33] sctp: lift copying in addrs into sctp_setsockopt
Date: Wed, 13 May 2020 08:26:41 +0200 [thread overview]
Message-ID: <20200513062649.2100053-27-hch@lst.de> (raw)
In-Reply-To: <20200513062649.2100053-1-hch@lst.de>
Prepare for additional kernel-space callers of sctp_setsockopt_bindx.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/sctp/socket.c | 71 ++++++++++++++++++-----------------------------
1 file changed, 27 insertions(+), 44 deletions(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 827a9903ee288..1c96b52c4aa28 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -972,18 +972,16 @@ int sctp_asconf_mgmt(struct sctp_sock *sp, struct sctp_sockaddr_entry *addrw)
* it.
*
* sk The sk of the socket
- * addrs The pointer to the addresses in user land
+ * addrs The pointer to the addresses
* addrssize Size of the addrs buffer
* op Operation to perform (add or remove, see the flags of
* sctp_bindx)
*
* Returns 0 if ok, <0 errno code on error.
*/
-static int sctp_setsockopt_bindx(struct sock *sk,
- struct sockaddr __user *addrs,
+static int sctp_setsockopt_bindx(struct sock *sk, struct sockaddr *kaddrs,
int addrs_size, int op)
{
- struct sockaddr *kaddrs;
int err;
int addrcnt = 0;
int walk_size = 0;
@@ -991,23 +989,13 @@ static int sctp_setsockopt_bindx(struct sock *sk,
void *addr_buf;
struct sctp_af *af;
- pr_debug("%s: sk:%p addrs:%p addrs_size:%d opt:%d\n",
- __func__, sk, addrs, addrs_size, op);
-
- if (unlikely(addrs_size <= 0))
- return -EINVAL;
+ pr_debug("%s: sk:%p kaddrs:%p addrs_size:%d opt:%d\n",
+ __func__, sk, kaddrs, addrs_size, op);
- kaddrs = memdup_user(addrs, addrs_size);
- if (IS_ERR(kaddrs))
- return PTR_ERR(kaddrs);
-
- /* Walk through the addrs buffer and count the number of addresses. */
addr_buf = kaddrs;
while (walk_size < addrs_size) {
- if (walk_size + sizeof(sa_family_t) > addrs_size) {
- kfree(kaddrs);
+ if (walk_size + sizeof(sa_family_t) > addrs_size)
return -EINVAL;
- }
sa_addr = addr_buf;
af = sctp_get_af_specific(sa_addr->sa_family);
@@ -1015,10 +1003,8 @@ static int sctp_setsockopt_bindx(struct sock *sk,
/* If the address family is not supported or if this address
* causes the address buffer to overflow return EINVAL.
*/
- if (!af || (walk_size + af->sockaddr_len) > addrs_size) {
- kfree(kaddrs);
+ if (!af || (walk_size + af->sockaddr_len) > addrs_size)
return -EINVAL;
- }
addrcnt++;
addr_buf += af->sockaddr_len;
walk_size += af->sockaddr_len;
@@ -1032,29 +1018,19 @@ static int sctp_setsockopt_bindx(struct sock *sk,
(struct sockaddr *)kaddrs,
addrs_size);
if (err)
- goto out;
+ return err;
err = sctp_bindx_add(sk, kaddrs, addrcnt);
if (err)
- goto out;
- err = sctp_send_asconf_add_ip(sk, kaddrs, addrcnt);
- break;
-
+ return err;
+ return sctp_send_asconf_add_ip(sk, kaddrs, addrcnt);
case SCTP_BINDX_REM_ADDR:
err = sctp_bindx_rem(sk, kaddrs, addrcnt);
if (err)
- goto out;
- err = sctp_send_asconf_del_ip(sk, kaddrs, addrcnt);
- break;
-
+ return err;
+ return sctp_send_asconf_del_ip(sk, kaddrs, addrcnt);
default:
- err = -EINVAL;
- break;
+ return -EINVAL;
}
-
-out:
- kfree(kaddrs);
-
- return err;
}
static int sctp_connect_new_asoc(struct sctp_endpoint *ep,
@@ -4670,6 +4646,7 @@ static int sctp_setsockopt_pf_expose(struct sock *sk,
static int sctp_setsockopt(struct sock *sk, int level, int optname,
char __user *optval, unsigned int optlen)
{
+ struct sockaddr *kaddrs;
int retval = 0;
pr_debug("%s: sk:%p, optname:%d\n", __func__, sk, optname);
@@ -4682,30 +4659,37 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
*/
if (level != SOL_SCTP) {
struct sctp_af *af = sctp_sk(sk)->pf->af;
- retval = af->setsockopt(sk, level, optname, optval, optlen);
- goto out_nounlock;
+ return af->setsockopt(sk, level, optname, optval, optlen);
}
+ if (unlikely(optlen <= 0))
+ return -EINVAL;
+
+ kaddrs = memdup_user(optval, optlen);
+ if (IS_ERR(kaddrs))
+ return PTR_ERR(kaddrs);
+
+ /* Walk through the addrs buffer and count the number of addresses. */
+
lock_sock(sk);
switch (optname) {
case SCTP_SOCKOPT_BINDX_ADD:
/* 'optlen' is the size of the addresses buffer. */
- retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
+ retval = sctp_setsockopt_bindx(sk, (struct sockaddr *)optval,
optlen, SCTP_BINDX_ADD_ADDR);
break;
case SCTP_SOCKOPT_BINDX_REM:
/* 'optlen' is the size of the addresses buffer. */
- retval = sctp_setsockopt_bindx(sk, (struct sockaddr __user *)optval,
+ retval = sctp_setsockopt_bindx(sk, (struct sockaddr *)optval,
optlen, SCTP_BINDX_REM_ADDR);
break;
case SCTP_SOCKOPT_CONNECTX_OLD:
/* 'optlen' is the size of the addresses buffer. */
retval = sctp_setsockopt_connectx_old(sk,
- (struct sockaddr __user *)optval,
- optlen);
+ (struct sockaddr *)optval, optlen);
break;
case SCTP_SOCKOPT_CONNECTX:
@@ -4871,8 +4855,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
}
release_sock(sk);
-
-out_nounlock:
+ kfree(kaddrs);
return retval;
}
--
2.26.2
next prev parent reply other threads:[~2020-05-13 6:29 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 6:26 remove kernel_setsockopt and kernel_getsockopt Christoph Hellwig
2020-05-13 6:26 ` [PATCH 01/33] net: add sock_set_reuseaddr Christoph Hellwig
2020-05-13 6:26 ` [PATCH 02/33] net: add sock_set_linger Christoph Hellwig
2020-05-13 6:26 ` [PATCH 03/33] net: add sock_set_priority Christoph Hellwig
2020-05-13 6:26 ` [PATCH 04/33] net: add sock_set_sndtimeo Christoph Hellwig
2020-05-13 6:26 ` [PATCH 05/33] net: add sock_bindtoindex Christoph Hellwig
2020-05-13 6:26 ` [PATCH 06/33] net: add sock_set_timestamps Christoph Hellwig
2020-05-13 6:26 ` [PATCH 07/33] net: add sock_set_keepalive Christoph Hellwig
2020-05-13 6:26 ` [PATCH 08/33] net: add sock_set_rcvbuf Christoph Hellwig
2020-05-13 6:26 ` [PATCH 09/33] net: add sock_set_reuseport Christoph Hellwig
2020-05-13 6:26 ` [PATCH 10/33] tcp: add tcp_sock_set_cork Christoph Hellwig
2020-05-13 6:26 ` [PATCH 11/33] tcp: tcp_sock_set_nodelay Christoph Hellwig
2020-05-13 12:51 ` Jason Gunthorpe
2020-05-13 6:26 ` [PATCH 12/33] tcp: add tcp_sock_set_quickack Christoph Hellwig
2020-05-13 6:26 ` [PATCH 13/33] tcp: add tcp_sock_set_syncnt Christoph Hellwig
2020-05-13 6:26 ` [PATCH 14/33] tcp: add tcp_sock_set_user_timeout Christoph Hellwig
2020-05-13 6:26 ` [PATCH 15/33] tcp: add tcp_sock_set_keepidle Christoph Hellwig
2020-05-13 6:26 ` [PATCH 16/33] tcp: add tcp_sock_set_keepintvl Christoph Hellwig
2020-05-13 6:26 ` [PATCH 17/33] tcp: add tcp_sock_set_keepcnt Christoph Hellwig
2020-05-13 6:26 ` [PATCH 18/33] ipv4: add ip_sock_set_tos Christoph Hellwig
2020-05-13 6:26 ` [PATCH 19/33] ipv4: add ip_sock_set_freebind Christoph Hellwig
2020-05-13 6:26 ` [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 ` [PATCH 21/33] ipv4: add ip_sock_set_mtu_discover Christoph Hellwig
2020-05-13 6:26 ` [PATCH 22/33] ipv6: add ip6_sock_set_v6only Christoph Hellwig
2020-05-13 6:26 ` [PATCH 23/33] ipv6: add ip6_sock_set_recverr Christoph Hellwig
2020-05-13 6:26 ` [PATCH 24/33] ipv6: add ip6_sock_set_addr_preferences Christoph Hellwig
2020-05-13 6:26 ` [PATCH 25/33] ipv6: add ip6_sock_set_recvpktinfo Christoph Hellwig
2020-05-13 6:26 ` Christoph Hellwig [this message]
2020-05-13 6:26 ` [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 ` 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 ` 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 ` [Ocfs2-devel] " Matthew Wilcox
2020-05-17 8:48 ` David Laight
2020-05-13 6:26 ` [PATCH 28/33] sctp: add sctp_sock_set_nodelay Christoph Hellwig
2020-05-13 6:26 ` [PATCH 29/33] rxrpc_sock_set_min_security_level Christoph Hellwig
2020-05-13 6:26 ` [PATCH 30/33] tipc: call tsk_set_importance from tipc_topsrv_create_listener Christoph Hellwig
2020-05-13 6:26 ` [PATCH 31/33] net: remove kernel_setsockopt Christoph Hellwig
2020-05-13 6:26 ` [PATCH 32/33] sctp: add sctp_sock_get_primary_addr Christoph Hellwig
2020-05-13 18:03 ` Marcelo Ricardo Leitner
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 ` [PATCH 33/33] net: remove kernel_getsockopt Christoph Hellwig
2020-05-13 13:13 ` [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 ` [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 ` [PATCH 20/33] ipv4: add ip_sock_set_recverr David Howells
2020-05-13 13:25 ` [PATCH 23/33] ipv6: add ip6_sock_set_recverr David Howells
2020-05-13 13:27 ` [PATCH 06/33] net: add sock_set_timestamps David Howells
2020-05-13 17:38 ` 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 ` [Ocfs2-devel] " 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=20200513062649.2100053-27-hch@lst.de \
--to=hch@lst.de \
--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=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=marcelo.leitner@gmail.com \
--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).