summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2011-08-09 21:24:47 +0200
committerHarald Welte <laforge@gnumonks.org>2011-08-09 22:05:51 +0200
commit52a0b12fe184efbdc9ad22ca5a392a49a22af8b2 (patch)
treeb3c941572cc78a129876e057ba490b9b1990f46c
parent0b69bc34d78073c568c03bf59af3d36e8ff057e6 (diff)
LAPD: Remove all calls to 'assert' from the code
For a system-level daemon, no protocol parser error should ever call assert, which would take down the entire process.
-rw-r--r--openbsc/src/libabis/input/lapd.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/openbsc/src/libabis/input/lapd.c b/openbsc/src/libabis/input/lapd.c
index d0fab1815..0d269cd41 100644
--- a/openbsc/src/libabis/input/lapd.c
+++ b/openbsc/src/libabis/input/lapd.c
@@ -31,7 +31,6 @@
#include <stdio.h>
#include <string.h>
-#include <assert.h>
#include <errno.h>
#include "lapd.h"
@@ -353,14 +352,20 @@ uint8_t *lapd_receive(struct lapd_instance *li, uint8_t * data, unsigned int len
nr = -1;
if ((data[2] & 1) == 0) {
typ = LAPD_TYPE_I;
- assert(len >= 4);
+ if (len < 4) {
+ LOGP(DMI, LOGL_ERROR, "LAPD I frame, len %d < 4\n", len);
+ return NULL;
+ }
ns = data[2] >> 1;
nr = data[3] >> 1;
pf = data[3] & 1;
cmd = LAPD_CMD_I;
} else if ((data[2] & 3) == 1) {
typ = LAPD_TYPE_S;
- assert(len >= 4);
+ if (len < 4) {
+ LOGP(DMI, LOGL_ERROR, "LAPD S frame, len %d < 4\n", len);
+ return NULL;
+ }
nr = data[3] >> 1;
pf = data[3] & 1;
switch (data[2]) {
@@ -445,7 +450,9 @@ uint8_t *lapd_receive(struct lapd_instance *li, uint8_t * data, unsigned int len
DEBUGP(DMI, "DOUBLE FRAME, ignoring\n");
cmd = 0; // ignore
} else {
- assert(0);
+ LOGP(DMI, LOGL_ERROR, "LAPD: Out of order "
+ "ns %d != vr %d, ignoring\n", ns, sap->vr);
+ return NULL;
};
} else {
//printf("IN SEQUENCE\n");