Commit af5ae60e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

sctp: pass a kernel pointer to sctp_setsockopt_rtoinfo 



Use the kernel pointer that sctp_setsockopt has available instead of
directly handling the user pointer.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f87ddbc0

net/sctp/socket.c

+12 −14
Original line number Diff line number Diff line
@@ -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);