From 729da88aff961d434c87ed813d8eafd2c1f7a856 Mon Sep 17 00:00:00 2001
From: Tommi Rantala <tt.rantala@gmail.com>
Date: Thu, 22 Nov 2012 03:23:16 +0000
Subject: [PATCH] --- yaml --- r: 336076 b: refs/heads/master c:
 6e51fe7572590d8d86e93b547fab6693d305fd0d h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/net/sctp/chunk.c  | 13 +++++++++----
 trunk/net/sctp/socket.c |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index bc333c121ae8..de43413ed8a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be364c8c0f17a3dd42707b5a090b318028538eb9
+refs/heads/master: 6e51fe7572590d8d86e93b547fab6693d305fd0d
diff --git a/trunk/net/sctp/chunk.c b/trunk/net/sctp/chunk.c
index f2aebdbb1eda..69ce21e3716f 100644
--- a/trunk/net/sctp/chunk.c
+++ b/trunk/net/sctp/chunk.c
@@ -183,7 +183,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 
 	msg = sctp_datamsg_new(GFP_KERNEL);
 	if (!msg)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	/* Note: Calculate this outside of the loop, so that all fragments
 	 * have the same expiration.
@@ -280,8 +280,11 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 
 		chunk = sctp_make_datafrag_empty(asoc, sinfo, len, frag, 0);
 
-		if (!chunk)
+		if (!chunk) {
+			err = -ENOMEM;
 			goto errout;
+		}
+
 		err = sctp_user_addto_chunk(chunk, offset, len, msgh->msg_iov);
 		if (err < 0)
 			goto errout_chunk_free;
@@ -315,8 +318,10 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 
 		chunk = sctp_make_datafrag_empty(asoc, sinfo, over, frag, 0);
 
-		if (!chunk)
+		if (!chunk) {
+			err = -ENOMEM;
 			goto errout;
+		}
 
 		err = sctp_user_addto_chunk(chunk, offset, over,msgh->msg_iov);
 
@@ -342,7 +347,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
 		sctp_chunk_free(chunk);
 	}
 	sctp_datamsg_put(msg);
-	return NULL;
+	return ERR_PTR(err);
 }
 
 /* Check whether this message has expired. */
diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c
index a60d1f8b41c5..406d957d08fb 100644
--- a/trunk/net/sctp/socket.c
+++ b/trunk/net/sctp/socket.c
@@ -1915,8 +1915,8 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
 
 	/* Break the message into multiple chunks of maximum size. */
 	datamsg = sctp_datamsg_from_user(asoc, sinfo, msg, msg_len);
-	if (!datamsg) {
-		err = -ENOMEM;
+	if (IS_ERR(datamsg)) {
+		err = PTR_ERR(datamsg);
 		goto out_free;
 	}