diff options
author | Alan Cox <alan@linux.intel.com> | 2012-09-04 00:13:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-04 12:57:35 -0400 |
commit | 6cf5c951175abcec4da470c50565cc0afe6cd11d (patch) | |
tree | 528117e0e3bfbbfe5345a73fdcedcaa7cfeff478 /net | |
parent | 9fef76857feed8e94ca3a5ee37db644f04a9488b (diff) |
netrom: copy_datagram_iovec can fail
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>
Diffstat (limited to 'net')
-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 06592d8b4a2b..1b9024ee963c 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
@@ -1169,7 +1169,12 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1169 | msg->msg_flags |= MSG_TRUNC; | 1169 | msg->msg_flags |= MSG_TRUNC; |
1170 | } | 1170 | } |
1171 | 1171 | ||
1172 | skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); | 1172 | er = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); |
1173 | if (er < 0) { | ||
1174 | skb_free_datagram(sk, skb); | ||
1175 | release_sock(sk); | ||
1176 | return er; | ||
1177 | } | ||
1173 | 1178 | ||
1174 | if (sax != NULL) { | 1179 | if (sax != NULL) { |
1175 | sax->sax25_family = AF_NETROM; | 1180 | sax->sax25_family = AF_NETROM; |