diff --git a/[refs] b/[refs] index b1e0264af739..769bc47f7219 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1e24df27fb1058739789126db6ad1b1ef719346 +refs/heads/master: 3e8a0a559c66ee9e7468195691a56fefc3589740 diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c index b622d9744856..1ca3b26eed0f 100644 --- a/trunk/net/dccp/proto.c +++ b/trunk/net/dccp/proto.c @@ -474,6 +474,11 @@ static int dccp_setsockopt_change(struct sock *sk, int type, if (copy_from_user(&opt, optval, sizeof(opt))) return -EFAULT; + /* + * rfc4340: 6.1. Change Options + */ + if (opt.dccpsf_len < 1) + return -EINVAL; val = kmalloc(opt.dccpsf_len, GFP_KERNEL); if (!val)