[PATCH 3/3] gtphub: fix three oversights (thanks to coverity).

- an unnecessary if-not-NULL check (1339764); - a missing nul termination safety net (1339768); - a typo resulting in the wrong proxy being logged (1339767). Sponsored-by: On-Waves ehi --- openbsc/src/gprs/gtphub.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/openbsc/src/gprs/gtphub.c b/openbsc/src/gprs/gtphub.c index 406d60d..22da9a3 100644 --- a/openbsc/src/gprs/gtphub.c +++ b/openbsc/src/gprs/gtphub.c @@ -1223,10 +1223,7 @@ static int gtphub_write(const struct osmo_fd *to, errno = 0; ssize_t sent = sendto(to->fd, buf, buf_len, 0, (struct sockaddr*)&to_addr->a, to_addr->l); - - if (to_addr) { - LOG(LOGL_DEBUG, "to %s\n", osmo_sockaddr_to_str(to_addr)); - } + LOG(LOGL_DEBUG, "to %s\n", osmo_sockaddr_to_str(to_addr)); if (sent == -1) { LOG(LOGL_ERROR, "error: %s\n", strerror(errno)); @@ -1712,6 +1709,7 @@ void gtphub_resolved_ggsn(struct gtphub *hub, const char *apn_oi_str, gtphub_port_ref_count_inc(pp); strncpy(ggsn->apn_oi_str, apn_oi_str, sizeof(ggsn->apn_oi_str)); + ggsn->apn_oi_str[sizeof(ggsn->apn_oi_str) - 1] = '\0'; ggsn->expiry_entry.del_cb = resolved_gssn_del_cb; expiry_add(&hub->expire_tei_maps, &ggsn->expiry_entry, now); @@ -1902,7 +1900,7 @@ int gtphub_start(struct gtphub *hub, struct gtphub_cfg *cfg) } for (plane_idx = 0; plane_idx < GTPH_PLANE_N; plane_idx++) { - if (hub->sgsn_proxy[plane_idx]) + if (hub->ggsn_proxy[plane_idx]) LOG(LOGL_NOTICE, "Using GGSN %s proxy %s\n", gtphub_plane_idx_names[plane_idx], gtphub_port_str(hub->ggsn_proxy[plane_idx])); -- 2.1.4