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 16/51] sctp: pass a kernel pointer to sctp_setsockopt_rtoinfo
Date: Sun, 19 Jul 2020 09:21:53 +0200 [thread overview]
Message-ID: <20200719072228.112645-17-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 | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index f9fe93e865b970..6339a08b62dd2b 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -3041,9 +3041,10 @@ static int sctp_setsockopt_nodelay(struct sock *sk, int *val,
* be changed.
*
*/
-static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigned int optlen)
+static int sctp_setsockopt_rtoinfo(struct sock *sk,
+ struct sctp_rtoinfo *rtoinfo,
+ unsigned int optlen)
{
- struct sctp_rtoinfo rtoinfo;
struct sctp_association *asoc;
unsigned long rto_min, rto_max;
struct sctp_sock *sp = sctp_sk(sk);
@@ -3051,18 +3052,15 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigne
if (optlen != sizeof (struct sctp_rtoinfo))
return -EINVAL;
- if (copy_from_user(&rtoinfo, optval, optlen))
- return -EFAULT;
-
- asoc = sctp_id2assoc(sk, rtoinfo.srto_assoc_id);
+ asoc = sctp_id2assoc(sk, rtoinfo->srto_assoc_id);
/* Set the values to the specific association */
- if (!asoc && rtoinfo.srto_assoc_id != SCTP_FUTURE_ASSOC &&
+ if (!asoc && rtoinfo->srto_assoc_id != SCTP_FUTURE_ASSOC &&
sctp_style(sk, UDP))
return -EINVAL;
- rto_max = rtoinfo.srto_max;
- rto_min = rtoinfo.srto_min;
+ rto_max = rtoinfo->srto_max;
+ rto_min = rtoinfo->srto_min;
if (rto_max)
rto_max = asoc ? msecs_to_jiffies(rto_max) : rto_max;
@@ -3078,17 +3076,17 @@ static int sctp_setsockopt_rtoinfo(struct sock *sk, char __user *optval, unsigne
return -EINVAL;
if (asoc) {
- if (rtoinfo.srto_initial != 0)
+ if (rtoinfo->srto_initial != 0)
asoc->rto_initial =
- msecs_to_jiffies(rtoinfo.srto_initial);
+ msecs_to_jiffies(rtoinfo->srto_initial);
asoc->rto_max = rto_max;
asoc->rto_min = rto_min;
} else {
/* If there is no association or the association-id = 0
* set the values to the endpoint.
*/
- if (rtoinfo.srto_initial != 0)
- sp->rtoinfo.srto_initial = rtoinfo.srto_initial;
+ if (rtoinfo->srto_initial != 0)
+ sp->rtoinfo.srto_initial = rtoinfo->srto_initial;
sp->rtoinfo.srto_max = rto_max;
sp->rtoinfo.srto_min = rto_min;
}
@@ -4692,7 +4690,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_nodelay(sk, kopt, optlen);
break;
case SCTP_RTOINFO:
- retval = sctp_setsockopt_rtoinfo(sk, optval, optlen);
+ retval = sctp_setsockopt_rtoinfo(sk, kopt, optlen);
break;
case SCTP_ASSOCINFO:
retval = sctp_setsockopt_associnfo(sk, optval, optlen);
--
2.27.0
next prev parent reply other threads:[~2020-07-19 7:24 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` [PATCH 03/51] sctp: pass a kernel pointer to __sctp_setsockopt_connectx Christoph Hellwig
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 ` Christoph Hellwig [this message]
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-17-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).