From 573a7916e8baab69bd38a9b5f5bf1c7332aeb733 Mon Sep 17 00:00:00 2001 From: Dmitry Tarnyagin Date: Thu, 2 Feb 2012 01:21:03 +0000 Subject: [PATCH] --- yaml --- r: 287482 b: refs/heads/master c: ba7605745d5c99f0e71b3ec6c7cb5ed6afe540ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/caif/caif_socket.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 87185d1febdd..7a71afe64249 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b01377a4200d0dfc7b04a8daabb4739727353703 +refs/heads/master: ba7605745d5c99f0e71b3ec6c7cb5ed6afe540ad diff --git a/trunk/net/caif/caif_socket.c b/trunk/net/caif/caif_socket.c index a98628086452..a97d97a3a512 100644 --- a/trunk/net/caif/caif_socket.c +++ b/trunk/net/caif/caif_socket.c @@ -539,8 +539,10 @@ static int transmit_skb(struct sk_buff *skb, struct caifsock *cf_sk, pkt = cfpkt_fromnative(CAIF_DIR_OUT, skb); memset(skb->cb, 0, sizeof(struct caif_payload_info)); - if (cf_sk->layer.dn == NULL) + if (cf_sk->layer.dn == NULL) { + kfree_skb(skb); return -EINVAL; + } return cf_sk->layer.dn->transmit(cf_sk->layer.dn, pkt); } @@ -683,10 +685,10 @@ static int caif_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, } err = transmit_skb(skb, cf_sk, msg->msg_flags&MSG_DONTWAIT, timeo); - if (err < 0) { - kfree_skb(skb); + if (err < 0) + /* skb is already freed */ goto pipe_err; - } + sent += size; }