diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-29 12:51:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-29 12:51:17 -0500 |
| commit | 8a2cf062b27ef5511a7d8a7ce6662fbc04f671b8 (patch) | |
| tree | 31f32c0d9a548f0dbbe9f3a32aca5767093d98b4 /net/sctp/socket.c | |
| parent | 3177bf6f922f62743133abbcbbbb5545f4133b2d (diff) | |
| parent | e9296e89b85604862bd9ec2d54dc43edad775c0d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 2e897069310a..bc1624913c42 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -1916,8 +1916,8 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk, | |||
| 1916 | 1916 | ||
| 1917 | /* Break the message into multiple chunks of maximum size. */ | 1917 | /* Break the message into multiple chunks of maximum size. */ |
| 1918 | datamsg = sctp_datamsg_from_user(asoc, sinfo, msg, msg_len); | 1918 | datamsg = sctp_datamsg_from_user(asoc, sinfo, msg, msg_len); |
| 1919 | if (!datamsg) { | 1919 | if (IS_ERR(datamsg)) { |
| 1920 | err = -ENOMEM; | 1920 | err = PTR_ERR(datamsg); |
| 1921 | goto out_free; | 1921 | goto out_free; |
| 1922 | } | 1922 | } |
| 1923 | 1923 | ||