diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-09-04 04:13:18 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-10 03:31:33 +0100 |
| commit | 85c5e1ba63575f0d345969f8adfa501f9cf99037 (patch) | |
| tree | d8b0687c5c628cb558b4220daf03728a093e108b /net/netrom | |
| parent | d1cf1d013b7966060d01b4dc5753699c5585c150 (diff) | |
| download | kernel_samsung_smdk4412-85c5e1ba63575f0d345969f8adfa501f9cf99037.zip kernel_samsung_smdk4412-85c5e1ba63575f0d345969f8adfa501f9cf99037.tar.gz kernel_samsung_smdk4412-85c5e1ba63575f0d345969f8adfa501f9cf99037.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: Ben Hutchings <ben@decadent.org.uk>
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; |