diff options
-rw-r--r-- | net/dccp/output.c | 3 | ||||
-rw-r--r-- | net/dccp/proto.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index 946ec2db75de..7006549f7050 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -241,7 +241,8 @@ int dccp_write_xmit(struct sock *sk, struct sk_buff *skb, long *timeo) | |||
241 | 241 | ||
242 | err = dccp_transmit_skb(sk, skb); | 242 | err = dccp_transmit_skb(sk, skb); |
243 | ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len); | 243 | ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len); |
244 | } | 244 | } else |
245 | kfree_skb(skb); | ||
245 | 246 | ||
246 | return err; | 247 | return err; |
247 | } | 248 | } |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index a1cfd0e9e3bc..a021c3422f67 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -402,8 +402,6 @@ int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
402 | * This bug was _quickly_ found & fixed by just looking at an OSTRA | 402 | * This bug was _quickly_ found & fixed by just looking at an OSTRA |
403 | * generated callgraph 8) -acme | 403 | * generated callgraph 8) -acme |
404 | */ | 404 | */ |
405 | if (rc != 0) | ||
406 | goto out_discard; | ||
407 | out_release: | 405 | out_release: |
408 | release_sock(sk); | 406 | release_sock(sk); |
409 | return rc ? : len; | 407 | return rc ? : len; |