Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCTP] Fix SCTP_SETADAPTION sockopt to use the correct structure.

Browse source 
Signed-off-by: Ivan Skytte Jorgensen <isj-sctp@i1.dk>
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
This commit is contained in:
Ivan Skytte Jorgensen 2005-10-28 15:33:24 -07:00 • committed by Sridhar Samudrala
parent eaa5c54dbe
commit a1ab358269
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/sctp/socket.c
View file

@ -2384,14 +2384,14 @@ static int sctp_setsockopt_peer_primary_addr(struct sock *sk, char __user *optva
static int sctp_setsockopt_adaption_layer(struct sock *sk, char __user *optval, static int sctp_setsockopt_adaption_layer(struct sock *sk, char __user *optval,
int optlen) int optlen)
{ {
__u32 val; struct sctp_setadaption adaption;
if (optlen < sizeof(__u32)) if (optlen != sizeof(struct sctp_setadaption))
return -EINVAL; return -EINVAL;
if (copy_from_user(&val, optval, sizeof(__u32))) if (copy_from_user(&adaption, optval, optlen))
return -EFAULT; return -EFAULT;
sctp_sk(sk)->adaption_ind = val; sctp_sk(sk)->adaption_ind = adaption.ssb_adaption_ind;
return 0; return 0;
} }
@ -3672,17 +3672,15 @@ static int sctp_getsockopt_primary_addr(struct sock *sk, int len,
static int sctp_getsockopt_adaption_layer(struct sock *sk, int len, static int sctp_getsockopt_adaption_layer(struct sock *sk, int len,
char __user *optval, int __user *optlen) char __user *optval, int __user *optlen)
{ {
__u32 val; struct sctp_setadaption adaption;
if (len < sizeof(__u32)) if (len != sizeof(struct sctp_setadaption))
return -EINVAL; return -EINVAL;
len = sizeof(__u32); adaption.ssb_adaption_ind = sctp_sk(sk)->adaption_ind;
val = sctp_sk(sk)->adaption_ind; if (copy_to_user(optval, &adaption, len))
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &val, len))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }