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

sctp: pass a kernel pointer to sctp_setsockopt_fragment_interleave 



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 722eca9e

net/sctp/socket.c

+3 −8
Original line number Diff line number Diff line
@@ -3422,18 +3422,13 @@ static int sctp_setsockopt_context(struct sock *sk, 
 * application using the one to many model may become confused and act

 * incorrectly.

 */

static int sctp_setsockopt_fragment_interleave(struct sock *sk,

					       char __user *optval,

static int sctp_setsockopt_fragment_interleave(struct sock *sk, int *val,

					       unsigned int optlen)

{

	int val;



	if (optlen != sizeof(int))

		return -EINVAL;

	if (get_user(val, (int __user *)optval))

		return -EFAULT;



	sctp_sk(sk)->frag_interleave = !!val;

	sctp_sk(sk)->frag_interleave = !!*val;



	if (!sctp_sk(sk)->frag_interleave)

		sctp_sk(sk)->ep->intl_enable = 0;
@@ -4701,7 +4696,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, 
		retval = sctp_setsockopt_context(sk, kopt, optlen);

		break;

	case SCTP_FRAGMENT_INTERLEAVE:

		retval = sctp_setsockopt_fragment_interleave(sk, optval, optlen);

		retval = sctp_setsockopt_fragment_interleave(sk, kopt, optlen);

		break;

	case SCTP_MAX_BURST:

		retval = sctp_setsockopt_maxburst(sk, optval, optlen);