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

sctp: pass a kernel pointer to sctp_setsockopt_initmsg 



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 bb13d647

net/sctp/socket.c

+11 −13
Original line number Diff line number Diff line
@@ -2832,24 +2832,22 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, 
 * by the change).  With TCP-style sockets, this option is inherited by

 * sockets derived from a listener socket.

 */

static int sctp_setsockopt_initmsg(struct sock *sk, char __user *optval, unsigned int optlen)

static int sctp_setsockopt_initmsg(struct sock *sk, struct sctp_initmsg *sinit,

				   unsigned int optlen)

{

	struct sctp_initmsg sinit;

	struct sctp_sock *sp = sctp_sk(sk);



	if (optlen != sizeof(struct sctp_initmsg))

		return -EINVAL;

	if (copy_from_user(&sinit, optval, optlen))

		return -EFAULT;



	if (sinit.sinit_num_ostreams)

		sp->initmsg.sinit_num_ostreams = sinit.sinit_num_ostreams;

	if (sinit.sinit_max_instreams)

		sp->initmsg.sinit_max_instreams = sinit.sinit_max_instreams;

	if (sinit.sinit_max_attempts)

		sp->initmsg.sinit_max_attempts = sinit.sinit_max_attempts;

	if (sinit.sinit_max_init_timeo)

		sp->initmsg.sinit_max_init_timeo = sinit.sinit_max_init_timeo;

	if (sinit->sinit_num_ostreams)

		sp->initmsg.sinit_num_ostreams = sinit->sinit_num_ostreams;

	if (sinit->sinit_max_instreams)

		sp->initmsg.sinit_max_instreams = sinit->sinit_max_instreams;

	if (sinit->sinit_max_attempts)

		sp->initmsg.sinit_max_attempts = sinit->sinit_max_attempts;

	if (sinit->sinit_max_init_timeo)

		sp->initmsg.sinit_max_init_timeo = sinit->sinit_max_init_timeo;



	return 0;

}
@@ -4694,7 +4692,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, 
		break;



	case SCTP_INITMSG:

		retval = sctp_setsockopt_initmsg(sk, optval, optlen);

		retval = sctp_setsockopt_initmsg(sk, kopt, optlen);

		break;

	case SCTP_DEFAULT_SEND_PARAM:

		retval = sctp_setsockopt_default_send_param(sk, optval,