From a6a68e62d9b8efba17b40a8871211cdabdbda851 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 25 Nov 2016 13:21:02 +0100 Subject: fix error rc in various ASN.1 decoding functions Fixes: CID#57945, CID#57946, CID#57947, CID#57948, CID#57950, CID#57951 Change-Id: I2d9ee1aa79959c5973041393f4769faa13720898 --- src/hnbgw_cn.c | 2 +- src/hnbgw_hnbap.c | 2 +- src/hnbgw_ranap.c | 2 +- src/hnbgw_rua.c | 2 +- src/ranap_common_cn.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hnbgw_cn.c b/src/hnbgw_cn.c index f97f627..0e993e2 100644 --- a/src/hnbgw_cn.c +++ b/src/hnbgw_cn.c @@ -235,7 +235,7 @@ static int handle_cn_ranap(struct hnbgw_cnlink *cnlink, const uint8_t *data, data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); - return rc; + return -1; } rc = _cn_ranap_rx(cnlink, pdu, data, len); diff --git a/src/hnbgw_hnbap.c b/src/hnbgw_hnbap.c index 59150c9..0473482 100644 --- a/src/hnbgw_hnbap.c +++ b/src/hnbgw_hnbap.c @@ -568,7 +568,7 @@ int hnbgw_hnbap_rx(struct hnb_context *hnb, struct msgb *msg) msg->data, msgb_length(msg), 0, 0); if (dec_ret.code != RC_OK) { LOGP(DHNBAP, LOGL_ERROR, "Error in ASN.1 decode\n"); - return rc; + return -1; } rc = _hnbgw_hnbap_rx(hnb, pdu); diff --git a/src/hnbgw_ranap.c b/src/hnbgw_ranap.c index 7a505a5..7fd6d0a 100644 --- a/src/hnbgw_ranap.c +++ b/src/hnbgw_ranap.c @@ -218,7 +218,7 @@ int hnbgw_ranap_rx(struct msgb *msg, uint8_t *data, size_t len) data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); - return rc; + return -1; } rc = _hnbgw_ranap_rx(msg->dst, pdu); diff --git a/src/hnbgw_rua.c b/src/hnbgw_rua.c index ca745b1..2c34421 100644 --- a/src/hnbgw_rua.c +++ b/src/hnbgw_rua.c @@ -537,7 +537,7 @@ int hnbgw_rua_rx(struct hnb_context *hnb, struct msgb *msg) msg->data, msgb_length(msg), 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRUA, LOGL_ERROR, "Error in ASN.1 decode\n"); - return rc; + return -1; } rc = _hnbgw_rua_rx(msg, pdu); diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 3736dce..d02eb37 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -296,7 +296,7 @@ int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); - return rc; + return -1; } message.direction = pdu->present; @@ -525,7 +525,7 @@ int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) data, len, 0, 0); if (dec_ret.code != RC_OK) { LOGP(DRANAP, LOGL_ERROR, "Error in RANAP ASN.1 decode\n"); - return rc; + return -1; } message.direction = pdu->present; -- cgit v1.2.3