diff --git a/[refs] b/[refs]
index 6715042f214b..1bce966e875e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35f9c09fe9c72eb8ca2b8e89a593e1c151f28fc2
+refs/heads/master: bcf1b70ac6eb0ed8286c66e6bf37cb747cbaa04c
diff --git a/trunk/net/phonet/pep.c b/trunk/net/phonet/pep.c
index 9f60008740e3..9726fe684ab8 100644
--- a/trunk/net/phonet/pep.c
+++ b/trunk/net/phonet/pep.c
@@ -1130,6 +1130,9 @@ static int pep_sendmsg(struct kiocb *iocb, struct sock *sk,
 	int flags = msg->msg_flags;
 	int err, done;
 
+	if (len > USHRT_MAX)
+		return -EMSGSIZE;
+
 	if ((msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_NOSIGNAL|
 				MSG_CMSG_COMPAT)) ||
 			!(msg->msg_flags & MSG_EOR))