aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-10-14 21:17:30 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-10-14 22:05:52 +0200
commite383980a7e39b25e3b16904581c879fb5a5b0e30 (patch)
tree95ff3510bf3d17f372c469be2905dbfd0f4770d0
parentd9e81d0fcf2b1a1064d5ee0031f5edc8f2ebf2c3 (diff)
ipaccess: Make sure the unitid is null terminated
The nanoBTS is sending null terminated strings, make sure they are really null terminated.
-rw-r--r--openbsc/src/input/ipaccess.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/openbsc/src/input/ipaccess.c b/openbsc/src/input/ipaccess.c
index faa54583..18268f6b 100644
--- a/openbsc/src/input/ipaccess.c
+++ b/openbsc/src/input/ipaccess.c
@@ -219,6 +219,8 @@ static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg,
u_int8_t msg_type = *(msg->l2h);
u_int16_t site_id = 0, bts_id = 0, trx_id = 0;
struct gsm_bts *bts;
+ char *unitid;
+ int len;
/* handle base messages */
ipaccess_rcvmsg_base(msg, bfd);
@@ -234,9 +236,14 @@ static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg,
if (!TLVP_PRESENT(&tlvp, IPAC_IDTAG_UNIT))
break;
+ len = TLVP_LEN(&tlvp, IPAC_IDTAG_UNIT);
+ if (len < 1)
+ break;
+
/* lookup BTS, create sign_link, ... */
- parse_unitid((char *)TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT),
- &site_id, &bts_id, &trx_id);
+ unitid = (char *) TLVP_VAL(&tlvp, IPAC_IDTAG_UNIT);
+ unitid[len - 1] = '\0';
+ parse_unitid(unitid, &site_id, &bts_id, &trx_id);
bts = find_bts_by_unitid(e1h->gsmnet, site_id, bts_id);
if (!bts) {
LOGP(DINP, LOGL_ERROR, "Unable to find BTS configuration for "