[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120904141315.26374.38822.stgit@localhost.localdomain>
Date: Tue, 04 Sep 2012 15:13:18 +0100
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: netdev@...r.kernel.org
Subject: [PATCH] netrom: copy_datagram_iovec can fail
From: Alan Cox <alan@...ux.intel.com>
Check for an error from this and if so bail properly.
Signed-off-by: Alan Cox <alan@...ux.intel.com>
---
net/netrom/af_netrom.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 06592d8..1b9024e 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,
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;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists