diff --git a/[refs] b/[refs]
index 915a744ae04a..504df2c33f05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b711c12113620081708c6ccd43768b5a2501e2ab
+refs/heads/master: ece6b0a2b25652d684a7ced4ae680a863af041e0
diff --git a/trunk/net/rds/message.c b/trunk/net/rds/message.c
index f0a4658f3273..aff589cc022e 100644
--- a/trunk/net/rds/message.c
+++ b/trunk/net/rds/message.c
@@ -197,6 +197,9 @@ struct rds_message *rds_message_alloc(unsigned int extra_len, gfp_t gfp)
 {
 	struct rds_message *rm;
 
+	if (extra_len > KMALLOC_MAX_SIZE - sizeof(struct rds_message))
+		return NULL;
+
 	rm = kzalloc(sizeof(struct rds_message) + extra_len, gfp);
 	if (!rm)
 		goto out;