From: Christoph Hellwig <hch@lst.de>
To: Vlad Yasevich <vyasevich@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
David Laight <David.Laight@ACULAB.COM>,
linux-sctp@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 03/51] sctp: pass a kernel pointer to __sctp_setsockopt_connectx
Date: Sun, 19 Jul 2020 07:21:40 +0000 [thread overview]
Message-ID: <20200719072228.112645-4-hch@lst.de> (raw)
In-Reply-To: <20200719072228.112645-1-hch@lst.de>
Use the kernel pointer that sctp_setsockopt has available instead of
directly handling the user pointer.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
net/sctp/socket.c | 50 ++++++++++++++++++-----------------------------
1 file changed, 19 insertions(+), 31 deletions(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 85ba5155b177b1..44cf2848146a91 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1286,36 +1286,29 @@ static int __sctp_connect(struct sock *sk, struct sockaddr *kaddrs,
* 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
*
* Returns >=0 if ok, <0 errno code on error.
*/
-static int __sctp_setsockopt_connectx(struct sock *sk,
- struct sockaddr __user *addrs,
- int addrs_size,
- sctp_assoc_t *assoc_id)
+static int __sctp_setsockopt_connectx(struct sock *sk, struct sockaddr *kaddrs,
+ int addrs_size, sctp_assoc_t *assoc_id)
{
- struct sockaddr *kaddrs;
int err = 0, flags = 0;
pr_debug("%s: sk:%p addrs:%p addrs_size:%d\n",
- __func__, sk, addrs, addrs_size);
+ __func__, sk, kaddrs, addrs_size);
/* make sure the 1st addr's sa_family is accessible later */
if (unlikely(addrs_size < sizeof(sa_family_t)))
return -EINVAL;
- kaddrs = memdup_user(addrs, addrs_size);
- if (IS_ERR(kaddrs))
- return PTR_ERR(kaddrs);
-
/* Allow security module to validate connectx addresses. */
err = security_sctp_bind_connect(sk, SCTP_SOCKOPT_CONNECTX,
(struct sockaddr *)kaddrs,
addrs_size);
if (err)
- goto out_free;
+ return err;
/* in-kernel sockets don't generally have a file allocated to them
* if all they do is call sock_create_kern().
@@ -1323,12 +1316,7 @@ static int __sctp_setsockopt_connectx(struct sock *sk,
if (sk->sk_socket->file)
flags = sk->sk_socket->file->f_flags;
- err = __sctp_connect(sk, kaddrs, addrs_size, flags, assoc_id);
-
-out_free:
- kfree(kaddrs);
-
- return err;
+ return __sctp_connect(sk, kaddrs, addrs_size, flags, assoc_id);
}
/*
@@ -1336,10 +1324,10 @@ static int __sctp_setsockopt_connectx(struct sock *sk,
* to the option that doesn't provide association id.
*/
static int sctp_setsockopt_connectx_old(struct sock *sk,
- struct sockaddr __user *addrs,
+ struct sockaddr *kaddrs,
int addrs_size)
{
- return __sctp_setsockopt_connectx(sk, addrs, addrs_size, NULL);
+ return __sctp_setsockopt_connectx(sk, kaddrs, addrs_size, NULL);
}
/*
@@ -1349,13 +1337,13 @@ static int sctp_setsockopt_connectx_old(struct sock *sk,
* always positive.
*/
static int sctp_setsockopt_connectx(struct sock *sk,
- struct sockaddr __user *addrs,
+ struct sockaddr *kaddrs,
int addrs_size)
{
sctp_assoc_t assoc_id = 0;
int err = 0;
- err = __sctp_setsockopt_connectx(sk, addrs, addrs_size, &assoc_id);
+ err = __sctp_setsockopt_connectx(sk, kaddrs, addrs_size, &assoc_id);
if (err)
return err;
@@ -1385,6 +1373,7 @@ static int sctp_getsockopt_connectx3(struct sock *sk, int len,
{
struct sctp_getaddrs_old param;
sctp_assoc_t assoc_id = 0;
+ struct sockaddr *kaddrs;
int err = 0;
#ifdef CONFIG_COMPAT
@@ -1408,9 +1397,12 @@ static int sctp_getsockopt_connectx3(struct sock *sk, int len,
return -EFAULT;
}
- err = __sctp_setsockopt_connectx(sk, (struct sockaddr __user *)
- param.addrs, param.addr_num,
- &assoc_id);
+ kaddrs = memdup_user(param.addrs, param.addr_num);
+ if (IS_ERR(kaddrs))
+ return PTR_ERR(kaddrs);
+
+ err = __sctp_setsockopt_connectx(sk, kaddrs, param.addr_num, &assoc_id);
+ kfree(kaddrs);
if (err = 0 || err = -EINPROGRESS) {
if (copy_to_user(optval, &assoc_id, sizeof(assoc_id)))
return -EFAULT;
@@ -4700,16 +4692,12 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
case SCTP_SOCKOPT_CONNECTX_OLD:
/* 'optlen' is the size of the addresses buffer. */
- retval = sctp_setsockopt_connectx_old(sk,
- (struct sockaddr __user *)optval,
- optlen);
+ retval = sctp_setsockopt_connectx_old(sk, kopt, optlen);
break;
case SCTP_SOCKOPT_CONNECTX:
/* 'optlen' is the size of the addresses buffer. */
- retval = sctp_setsockopt_connectx(sk,
- (struct sockaddr __user *)optval,
- optlen);
+ retval = sctp_setsockopt_connectx(sk, kopt, optlen);
break;
case SCTP_DISABLE_FRAGMENTS:
--
2.27.0
next prev parent reply other threads:[~2020-07-19 7:21 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 17:46 do a single memdup_user in sctp_setsockopt Christoph Hellwig
2020-05-21 17:46 ` [PATCH 01/49] sctp: copy the optval from user space " Christoph Hellwig
2020-05-21 17:46 ` [PATCH 02/49] sctp: pass a kernel pointer to sctp_setsockopt_bindx Christoph Hellwig
2020-05-21 17:46 ` [PATCH 03/49] sctp: pass a kernel pointer to __sctp_setsockopt_connectx Christoph Hellwig
2020-05-21 17:46 ` [PATCH 04/49] sctp: pass a kernel pointer to sctp_setsockopt_disable_fragments Christoph Hellwig
2020-05-21 17:46 ` [PATCH 05/49] sctp: pass a kernel pointer to sctp_setsockopt_events Christoph Hellwig
2020-05-21 17:46 ` [PATCH 06/49] sctp: pass a kernel pointer to sctp_setsockopt_autoclose Christoph Hellwig
2020-05-21 17:46 ` [PATCH 07/49] sctp: pass a kernel pointer to sctp_setsockopt_peer_addr_params Christoph Hellwig
2020-05-21 17:46 ` [PATCH 08/49] sctp: pass a kernel pointer to sctp_setsockopt_delayed_ack Christoph Hellwig
2020-05-21 17:46 ` [PATCH 09/49] sctp: pass a kernel pointer to sctp_setsockopt_partial_delivery_point Christoph Hellwig
2020-05-21 17:46 ` [PATCH 10/49] sctp: pass a kernel pointer to sctp_setsockopt_initmsg Christoph Hellwig
2020-05-21 17:46 ` [PATCH 11/49] sctp: pass a kernel pointer to sctp_setsockopt_default_send_param Christoph Hellwig
2020-05-21 17:46 ` [PATCH 12/49] sctp: pass a kernel pointer to sctp_setsockopt_default_sndinfo Christoph Hellwig
2020-05-21 17:46 ` [PATCH 13/49] sctp: pass a kernel pointer to sctp_setsockopt_primary_addr Christoph Hellwig
2020-05-21 17:46 ` [PATCH 14/49] sctp: pass a kernel pointer to sctp_setsockopt_peer_primary_addr Christoph Hellwig
2020-05-21 17:46 ` [PATCH 15/49] sctp: pass a kernel pointer to sctp_setsockopt_nodelay Christoph Hellwig
2020-05-21 17:46 ` [PATCH 16/49] sctp: pass a kernel pointer to sctp_setsockopt_rtoinfo Christoph Hellwig
2020-05-21 17:46 ` [PATCH 17/49] sctp: pass a kernel pointer to sctp_setsockopt_associnfo Christoph Hellwig
2020-05-21 17:46 ` [PATCH 18/49] sctp: pass a kernel pointer to sctp_setsockopt_mappedv4 Christoph Hellwig
2020-05-21 17:46 ` [PATCH 19/49] sctp: pass a kernel pointer to sctp_setsockopt_maxseg Christoph Hellwig
2020-05-21 17:46 ` [PATCH 20/49] sctp: pass a kernel pointer to sctp_setsockopt_adaptation_layer Christoph Hellwig
2020-05-21 17:46 ` [PATCH 21/49] sctp: pass a kernel pointer to sctp_setsockopt_context Christoph Hellwig
2020-05-21 17:46 ` [PATCH 22/49] sctp: pass a kernel pointer to sctp_setsockopt_fragment_interleave Christoph Hellwig
2020-05-21 17:46 ` [PATCH 23/49] sctp: pass a kernel pointer to sctp_setsockopt_maxburst Christoph Hellwig
2020-05-21 17:46 ` [PATCH 24/49] sctp: pass a kernel pointer to sctp_setsockopt_auth_chunk Christoph Hellwig
2020-05-21 17:47 ` [PATCH 25/49] sctp: pass a kernel pointer to sctp_setsockopt_hmac_ident Christoph Hellwig
2020-05-21 17:47 ` [PATCH 26/49] sctp: pass a kernel pointer to sctp_setsockopt_auth_key Christoph Hellwig
2020-05-21 17:47 ` [PATCH 27/49] sctp: pass a kernel pointer to sctp_setsockopt_active_key Christoph Hellwig
2020-05-21 17:47 ` [PATCH 28/49] sctp: pass a kernel pointer to sctp_setsockopt_del_key Christoph Hellwig
2020-05-21 17:47 ` [PATCH 29/49] sctp: pass a kernel pointer to sctp_setsockopt_deactivate_key Christoph Hellwig
2020-05-21 17:47 ` [PATCH 30/49] sctp: pass a kernel pointer to sctp_setsockopt_auto_asconf Christoph Hellwig
2020-05-21 17:47 ` [PATCH 31/49] sctp: pass a kernel pointer to sctp_setsockopt_paddr_thresholds Christoph Hellwig
2020-05-21 17:47 ` [PATCH 32/49] sctp: pass a kernel pointer to sctp_setsockopt_recvrcvinfo Christoph Hellwig
2020-05-21 17:47 ` [PATCH 33/49] sctp: pass a kernel pointer to sctp_setsockopt_recvnxtinfo Christoph Hellwig
2020-05-21 17:47 ` [PATCH 34/49] sctp: pass a kernel pointer to sctp_setsockopt_pr_supported Christoph Hellwig
2020-05-21 17:47 ` [PATCH 35/49] sctp: pass a kernel pointer to sctp_setsockopt_default_prinfo Christoph Hellwig
2020-05-21 17:47 ` [PATCH 36/49] sctp: pass a kernel pointer to sctp_setsockopt_reconfig_supported Christoph Hellwig
2020-05-21 17:47 ` [PATCH 37/49] sctp: pass a kernel pointer to sctp_setsockopt_enable_strreset Christoph Hellwig
2020-05-21 17:47 ` [PATCH 38/49] sctp: pass a kernel pointer to sctp_setsockopt_reset_streams Christoph Hellwig
2020-05-21 17:47 ` [PATCH 39/49] sctp: pass a kernel pointer to sctp_setsockopt_reset_assoc Christoph Hellwig
2020-05-21 17:47 ` [PATCH 40/49] sctp: pass a kernel pointer to sctp_setsockopt_add_streams Christoph Hellwig
2020-05-21 17:47 ` [PATCH 41/49] sctp: pass a kernel pointer to sctp_setsockopt_scheduler Christoph Hellwig
2020-05-21 17:47 ` [PATCH 42/49] sctp: pass a kernel pointer to sctp_setsockopt_scheduler_value Christoph Hellwig
2020-05-21 17:47 ` [PATCH 43/49] sctp: pass a kernel pointer to sctp_setsockopt_interleaving_supported Christoph Hellwig
2020-05-21 17:47 ` [PATCH 44/49] sctp: pass a kernel pointer to sctp_setsockopt_reuse_port Christoph Hellwig
2020-05-21 17:47 ` [PATCH 45/49] sctp: pass a kernel pointer to sctp_setsockopt_event Christoph Hellwig
2020-05-21 17:47 ` [PATCH 46/49] " Christoph Hellwig
2020-05-21 17:47 ` [PATCH 47/49] sctp: pass a kernel pointer to sctp_setsockopt_auth_supported Christoph Hellwig
2020-05-21 17:47 ` [PATCH 48/49] sctp: pass a kernel pointer to sctp_setsockopt_ecn_supported Christoph Hellwig
2020-05-21 17:47 ` [PATCH 49/49] sctp: pass a kernel pointer to sctp_setsockopt_pf_expose Christoph Hellwig
2020-05-22 8:02 ` do a single memdup_user in sctp_setsockopt David Laight
2020-05-22 14:36 ` Marcelo Ricardo Leitner
2020-05-22 15:52 ` David Laight
2020-05-23 7:19 ` 'Christoph Hellwig'
2020-05-25 19:37 ` David Laight
2020-05-25 20:59 ` Marcelo Ricardo Leitner
2020-05-25 21:18 ` Marcelo Ricardo Leitner
2020-05-22 23:11 ` David Miller
2020-07-19 7:21 ` do a single memdup_user in sctp_setsockopt v2 Christoph Hellwig
2020-07-19 7:21 ` [PATCH 01/51] sctp: copy the optval from user space in sctp_setsockopt Christoph Hellwig
2020-07-19 7:21 ` [PATCH 02/51] sctp: pass a kernel pointer to sctp_setsockopt_bindx Christoph Hellwig
2020-07-19 7:21 ` Christoph Hellwig [this message]
2020-07-19 7:21 ` [PATCH 04/51] sctp: pass a kernel pointer to sctp_setsockopt_disable_fragments Christoph Hellwig
2020-07-19 7:21 ` [PATCH 05/51] sctp: pass a kernel pointer to sctp_setsockopt_events Christoph Hellwig
2020-07-19 7:21 ` [PATCH 06/51] sctp: pass a kernel pointer to sctp_setsockopt_autoclose Christoph Hellwig
2020-07-19 7:21 ` [PATCH 07/51] sctp: pass a kernel pointer to sctp_setsockopt_peer_addr_params Christoph Hellwig
2020-07-19 7:21 ` [PATCH 08/51] sctp: pass a kernel pointer to sctp_setsockopt_delayed_ack Christoph Hellwig
2020-07-19 7:21 ` [PATCH 09/51] sctp: pass a kernel pointer to sctp_setsockopt_partial_delivery_point Christoph Hellwig
2020-07-19 7:21 ` [PATCH 10/51] sctp: pass a kernel pointer to sctp_setsockopt_initmsg Christoph Hellwig
2020-07-19 7:21 ` [PATCH 11/51] sctp: pass a kernel pointer to sctp_setsockopt_default_send_param Christoph Hellwig
2020-07-19 7:21 ` [PATCH 12/51] sctp: pass a kernel pointer to sctp_setsockopt_default_sndinfo Christoph Hellwig
2020-07-19 7:21 ` [PATCH 13/51] sctp: pass a kernel pointer to sctp_setsockopt_primary_addr Christoph Hellwig
2020-07-19 7:21 ` [PATCH 14/51] sctp: pass a kernel pointer to sctp_setsockopt_peer_primary_addr Christoph Hellwig
2020-07-19 7:21 ` [PATCH 15/51] sctp: pass a kernel pointer to sctp_setsockopt_nodelay Christoph Hellwig
2020-07-19 7:21 ` [PATCH 16/51] sctp: pass a kernel pointer to sctp_setsockopt_rtoinfo Christoph Hellwig
2020-07-19 7:21 ` [PATCH 17/51] sctp: pass a kernel pointer to sctp_setsockopt_associnfo Christoph Hellwig
2020-07-19 7:21 ` [PATCH 18/51] sctp: pass a kernel pointer to sctp_setsockopt_mappedv4 Christoph Hellwig
2020-07-19 7:21 ` [PATCH 19/51] sctp: pass a kernel pointer to sctp_setsockopt_maxseg Christoph Hellwig
2020-07-19 7:21 ` [PATCH 20/51] sctp: pass a kernel pointer to sctp_setsockopt_adaptation_layer Christoph Hellwig
2020-07-19 7:21 ` [PATCH 21/51] sctp: pass a kernel pointer to sctp_setsockopt_context Christoph Hellwig
2020-07-19 7:21 ` [PATCH 22/51] sctp: pass a kernel pointer to sctp_setsockopt_fragment_interleave Christoph Hellwig
2020-07-19 7:22 ` [PATCH 23/51] sctp: pass a kernel pointer to sctp_setsockopt_maxburst Christoph Hellwig
2020-07-19 7:22 ` [PATCH 24/51] sctp: pass a kernel pointer to sctp_setsockopt_auth_chunk Christoph Hellwig
2020-07-19 7:22 ` [PATCH 25/51] sctp: pass a kernel pointer to sctp_setsockopt_hmac_ident Christoph Hellwig
2020-07-19 7:22 ` [PATCH 26/51] sctp: switch sctp_setsockopt_auth_key to use memzero_explicit Christoph Hellwig
2020-07-19 7:22 ` [PATCH 27/51] sctp: pass a kernel pointer to sctp_setsockopt_auth_key Christoph Hellwig
2020-07-19 7:22 ` [PATCH 28/51] sctp: pass a kernel pointer to sctp_setsockopt_active_key Christoph Hellwig
2020-07-19 7:22 ` [PATCH 29/51] sctp: pass a kernel pointer to sctp_setsockopt_del_key Christoph Hellwig
2020-07-19 7:22 ` [PATCH 30/51] sctp: pass a kernel pointer to sctp_setsockopt_deactivate_key Christoph Hellwig
2020-07-19 7:22 ` [PATCH 31/51] sctp: pass a kernel pointer to sctp_setsockopt_auto_asconf Christoph Hellwig
2020-07-19 7:22 ` [PATCH 32/51] sctp: pass a kernel pointer to sctp_setsockopt_paddr_thresholds Christoph Hellwig
2020-07-19 7:22 ` [PATCH 33/51] sctp: pass a kernel pointer to sctp_setsockopt_recvrcvinfo Christoph Hellwig
2020-07-19 7:22 ` [PATCH 34/51] sctp: pass a kernel pointer to sctp_setsockopt_recvnxtinfo Christoph Hellwig
2020-07-19 7:22 ` [PATCH 35/51] sctp: pass a kernel pointer to sctp_setsockopt_pr_supported Christoph Hellwig
2020-07-19 7:22 ` [PATCH 36/51] sctp: pass a kernel pointer to sctp_setsockopt_default_prinfo Christoph Hellwig
2020-07-19 7:22 ` [PATCH 37/51] sctp: pass a kernel pointer to sctp_setsockopt_reconfig_supported Christoph Hellwig
2020-07-19 7:22 ` [PATCH 38/51] sctp: pass a kernel pointer to sctp_setsockopt_enable_strreset Christoph Hellwig
2020-07-19 7:22 ` [PATCH 39/51] sctp: pass a kernel pointer to sctp_setsockopt_reset_streams Christoph Hellwig
2020-07-19 7:22 ` [PATCH 40/51] sctp: pass a kernel pointer to sctp_setsockopt_reset_assoc Christoph Hellwig
2020-07-19 7:22 ` [PATCH 41/51] sctp: pass a kernel pointer to sctp_setsockopt_add_streams Christoph Hellwig
2020-07-19 7:22 ` [PATCH 42/51] sctp: pass a kernel pointer to sctp_setsockopt_scheduler Christoph Hellwig
2020-07-19 7:22 ` [PATCH 43/51] sctp: pass a kernel pointer to sctp_setsockopt_scheduler_value Christoph Hellwig
2020-07-19 7:22 ` [PATCH 44/51] sctp: pass a kernel pointer to sctp_setsockopt_interleaving_supported Christoph Hellwig
2020-07-19 7:22 ` [PATCH 45/51] sctp: pass a kernel pointer to sctp_setsockopt_reuse_port Christoph Hellwig
2020-07-19 7:22 ` [PATCH 46/51] sctp: pass a kernel pointer to sctp_setsockopt_event Christoph Hellwig
2020-07-19 7:22 ` [PATCH 47/51] " Christoph Hellwig
2020-07-19 7:22 ` [PATCH 48/51] sctp: pass a kernel pointer to sctp_setsockopt_auth_supported Christoph Hellwig
2020-07-19 7:22 ` [PATCH 49/51] sctp: pass a kernel pointer to sctp_setsockopt_ecn_supported Christoph Hellwig
2020-07-19 7:22 ` [PATCH 50/51] sctp: pass a kernel pointer to sctp_setsockopt_pf_expose Christoph Hellwig
2020-07-19 7:22 ` [PATCH 51/51] sctp: remove the out_nounlock label in sctp_setsockopt Christoph Hellwig
2020-07-20 1:27 ` do a single memdup_user in sctp_setsockopt v2 David Miller
2020-07-20 13:08 ` Marcelo Ricardo Leitner
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=20200719072228.112645-4-hch@lst.de \
--to=hch@lst.de \
--cc=David.Laight@ACULAB.COM \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-sctp@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=vyasevich@gmail.com \
/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).