tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DCCP] getsockopt: Fix DCCP_SOCKOPT_[SEND,RECV]_CSCOV
+3
-1
+3
-1
net/dccp/proto.c
+3
-1
net/dccp/proto.c
···
575
575
if (get_user(len, optlen))
576
576
return -EFAULT;
577
577
578
-
if (len < sizeof(int))
578
+
if (len < (int)sizeof(int))
579
579
return -EINVAL;
580
580
581
581
dp = dccp_sk(sk);
···
589
589
(__be32 __user *)optval, optlen);
590
590
case DCCP_SOCKOPT_SEND_CSCOV:
591
591
val = dp->dccps_pcslen;
592
+
len = sizeof(val);
592
593
break;
593
594
case DCCP_SOCKOPT_RECV_CSCOV:
594
595
val = dp->dccps_pcrlen;
596
+
len = sizeof(val);
595
597
break;
596
598
case 128 ... 191:
597
599
return ccid_hc_rx_getsockopt(dp->dccps_hc_rx_ccid, sk, optname,