diff options
| author | Sjur Braendeland <sjur.brandeland@stericsson.com> | 2010-05-21 02:16:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-23 23:57:42 -0700 |
| commit | 638e628a600a5c542d46dfb06771cf9c229ef5f3 (patch) | |
| tree | 777d4d2b9aee8a1d4b0ce522bf3957023a9bfb7e /net/caif/cfserl.c | |
| parent | 7aecf4944f2c05aafb73b4820e469c74b4ec8517 (diff) | |
| download | kernel_samsung_aries-638e628a600a5c542d46dfb06771cf9c229ef5f3.zip kernel_samsung_aries-638e628a600a5c542d46dfb06771cf9c229ef5f3.tar.gz kernel_samsung_aries-638e628a600a5c542d46dfb06771cf9c229ef5f3.tar.bz2 | |
caif: Bugfix - handle mem-allocation failures
Discovered bugs when injecting slab allocation failures.
Add checks on all memory allocation.
Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/cfserl.c')
| -rw-r--r-- | net/caif/cfserl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c index 06029ea..cb4325a 100644 --- a/net/caif/cfserl.c +++ b/net/caif/cfserl.c @@ -67,6 +67,8 @@ static int cfserl_receive(struct cflayer *l, struct cfpkt *newpkt) layr->incomplete_frm = cfpkt_append(layr->incomplete_frm, newpkt, expectlen); pkt = layr->incomplete_frm; + if (pkt == NULL) + return -ENOMEM; } else { pkt = newpkt; } @@ -154,7 +156,6 @@ static int cfserl_receive(struct cflayer *l, struct cfpkt *newpkt) if (layr->usestx) { if (tail_pkt != NULL) pkt = cfpkt_append(pkt, tail_pkt, 0); - /* Start search for next STX if frame failed */ continue; } else { |