aboutsummaryrefslogtreecommitdiffstats
path: root/net/caif/cfvidl.c
diff options
context:
space:
mode:
authorDmitry Tarnyagin <dmitry.tarnyagin@stericsson.com>2012-03-11 06:28:31 -0400
committerDavid S. Miller <davem@davemloft.net>2012-03-11 18:38:16 -0400
commit374458b3fe4288f820dbf3de0728e314d969f9e4 (patch)
tree5249fa436617d45cd2c3e5fad60732fc6d1a0e94 /net/caif/cfvidl.c
parente8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258 (diff)
caif: Fix for a race in socket transmit with flow control.
Kill faulty checks on flow-off leading to connection drop at race conditions. caif_socket checks for flow-on before transmitting and goes to sleep or return -EAGAIN upon flow stop. Remove faulty subsequent checks on flow-off leading to connection drop. Also fix memory leaks on some of the errors paths. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/cfvidl.c')
-rw-r--r--net/caif/cfvidl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/caif/cfvidl.c b/net/caif/cfvidl.c
index e3f37db40ac..a8e2a2d758a 100644
--- a/net/caif/cfvidl.c
+++ b/net/caif/cfvidl.c
@@ -50,8 +50,12 @@ static int cfvidl_transmit(struct cflayer *layr, struct cfpkt *pkt)
50 struct caif_payload_info *info; 50 struct caif_payload_info *info;
51 u32 videoheader = 0; 51 u32 videoheader = 0;
52 int ret; 52 int ret;
53 if (!cfsrvl_ready(service, &ret)) 53
54 if (!cfsrvl_ready(service, &ret)) {
55 cfpkt_destroy(pkt);
54 return ret; 56 return ret;
57 }
58
55 cfpkt_add_head(pkt, &videoheader, 4); 59 cfpkt_add_head(pkt, &videoheader, 4);
56 /* Add info for MUX-layer to route the packet out */ 60 /* Add info for MUX-layer to route the packet out */
57 info = cfpkt_info(pkt); 61 info = cfpkt_info(pkt);