diff --git a/[refs] b/[refs]
index 5390f2c54b03..f08ef5e8a75f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d212318c9d1b11ff44b57f90b4f9d9c9b31a6ced
+refs/heads/master: c6db93a58f1745cfe1acc2e1a1d68afc3245eced
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
index 4bc558c19fcf..bbd3cd238d7f 100644
--- a/trunk/net/sctp/socket.c
+++ b/trunk/net/sctp/socket.c
@@ -5286,7 +5286,8 @@ static int sctp_getsockopt_maxburst(struct sock *sk, int len,
 		printk(KERN_WARNING
 		   "SCTP: Use struct sctp_assoc_value instead\n");
 		params.assoc_id = 0;
-	} else if (len == sizeof (struct sctp_assoc_value)) {
+	} else if (len >= sizeof(struct sctp_assoc_value)) {
+		len = sizeof(struct sctp_assoc_value);
 		if (copy_from_user(&params, optval, len))
 			return -EFAULT;
 	} else