---

yaml --- r: 108382 b: refs/heads/master c: 3e8a0a5 h: refs/heads/master v: v3
git-mirror · Aug 13, 2008 · e959791 · e959791
1 parent 7a68dd1
commit e959791
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)