diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-09-04 04:13:18 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:28:08 +0900 |
| commit | 6a992a944a1c283359959745cb5e1f1dbca40a16 (patch) | |
| tree | 2fe9ac2e5d83f8817baf36e7a77b81705d7ff818 /net/netrom | |
| parent | 60e6a188d4cb2ef0fb9865cd7b3d4fca7cf7213e (diff) | |
| download | kernel_samsung_smdk4412-6a992a944a1c283359959745cb5e1f1dbca40a16.zip kernel_samsung_smdk4412-6a992a944a1c283359959745cb5e1f1dbca40a16.tar.gz kernel_samsung_smdk4412-6a992a944a1c283359959745cb5e1f1dbca40a16.tar.bz2 | |
netrom: copy_datagram_iovec can fail
[ Upstream commit 6cf5c951175abcec4da470c50565cc0afe6cd11d ]
Check for an error from this and if so bail properly.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/netrom')
| -rw-r--r-- | net/netrom/af_netrom.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 732152f..f156382 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1170,7 +1170,12 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, msg->msg_flags |= MSG_TRUNC; } - skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); + er = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); + if (er < 0) { + skb_free_datagram(sk, skb); + release_sock(sk); + return er; + } if (sax != NULL) { sax->sax25_family = AF_NETROM; |