diff options
author | Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> | 2012-03-11 06:28:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-11 18:38:16 -0400 |
commit | 374458b3fe4288f820dbf3de0728e314d969f9e4 (patch) | |
tree | 5249fa436617d45cd2c3e5fad60732fc6d1a0e94 /net/caif/cfdgml.c | |
parent | e8abbe0d0236ac1d55d21fec7a8d2ee03e9d3258 (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/cfdgml.c')
-rw-r--r-- | net/caif/cfdgml.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/caif/cfdgml.c b/net/caif/cfdgml.c index 0f5ff27aa41c..a63f4a5f5aff 100644 --- a/net/caif/cfdgml.c +++ b/net/caif/cfdgml.c | |||
@@ -86,12 +86,17 @@ static int cfdgml_transmit(struct cflayer *layr, struct cfpkt *pkt) | |||
86 | struct caif_payload_info *info; | 86 | struct caif_payload_info *info; |
87 | struct cfsrvl *service = container_obj(layr); | 87 | struct cfsrvl *service = container_obj(layr); |
88 | int ret; | 88 | int ret; |
89 | if (!cfsrvl_ready(service, &ret)) | 89 | |
90 | if (!cfsrvl_ready(service, &ret)) { | ||
91 | cfpkt_destroy(pkt); | ||
90 | return ret; | 92 | return ret; |
93 | } | ||
91 | 94 | ||
92 | /* STE Modem cannot handle more than 1500 bytes datagrams */ | 95 | /* STE Modem cannot handle more than 1500 bytes datagrams */ |
93 | if (cfpkt_getlen(pkt) > DGM_MTU) | 96 | if (cfpkt_getlen(pkt) > DGM_MTU) { |
97 | cfpkt_destroy(pkt); | ||
94 | return -EMSGSIZE; | 98 | return -EMSGSIZE; |
99 | } | ||
95 | 100 | ||
96 | cfpkt_add_head(pkt, &zero, 3); | 101 | cfpkt_add_head(pkt, &zero, 3); |
97 | packet_type = 0x08; /* B9 set - UNCLASSIFIED */ | 102 | packet_type = 0x08; /* B9 set - UNCLASSIFIED */ |