paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-11-02 21:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the memory leak when SGW cannot find tunnel

Browse Source
This commit is contained in:
Sukchan Lee
2018-01-20 09:35:03 +09:00
parent 3be652701e
commit 56dd6b6a28
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pgw/pgw_gtp_path.c
View File

@@ -91,7 +91,7 @@ static int _gtpv2_c_recv_cb(sock_id sock, void *data)
{
d_error("pgw_event_send error");
pkbuf_free(pkbuf);
return -1;
return 0;
}
return 0;

15
src/sgw/sgw_gtp_path.c
View File

@@ -115,9 +115,14 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
d_trace(50, "Recv GPDU (teid = 0x%x)\n", teid);
tunnel = sgw_tunnel_find_by_teid(teid);
d_assert(tunnel, return -1, "No TEID(0x%x)", teid);
if (!tunnel)
{
d_error("No TEID(0x%x)", teid);
pkbuf_free(pkbuf);
return 0;
}
bearer = tunnel->bearer;
d_assert(bearer, return -1, "Null param");
d_assert(bearer, pkbuf_free(pkbuf); return 0, "Null param");
/* Convert TEID */
if (tunnel->interface_type ==
@@ -131,7 +136,7 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
d_trace(50, "Recv GPDU (teid = 0x%x) from eNB\n", teid);
s5u_tunnel = sgw_s5u_tunnel_in_bearer(bearer);
d_assert(s5u_tunnel, return -1, "Null param");
d_assert(s5u_tunnel, pkbuf_free(pkbuf); return 0, "Null param");
gtp_h->teid = htonl(s5u_tunnel->remote_teid);
gtp_send(s5u_tunnel->gnode, pkbuf);
}
@@ -141,7 +146,7 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
d_trace(50, "Recv GPDU (teid = 0x%x) from PGW\n", teid);
s1u_tunnel = sgw_s1u_tunnel_in_bearer(bearer);
d_assert(s1u_tunnel, return -1, "Null param");
d_assert(s1u_tunnel, pkbuf_free(pkbuf); return 0, "Null param");
if (s1u_tunnel->remote_teid)
{
/* If there is buffered packet, send it first */
@@ -189,7 +194,7 @@ static int _gtpv1_u_recv_cb(sock_id sock, void *data)
{
d_error("sgw_event_send error");
pkbuf_free(pkbuf);
return -1;
return 0;
}
SGW_SET_UE_STATE(sgw_ue, SGW_DL_NOTI_SENT);

2
test/attach_test.c
View File

@@ -1510,10 +1510,12 @@ abts_suite *test_attach(abts_suite *suite)
{
suite = ADD_SUITE(suite)
#if 0
abts_run_test(suite, attach_test1, NULL);
abts_run_test(suite, attach_test2, NULL);
abts_run_test(suite, attach_test3, NULL);
abts_run_test(suite, attach_test4, NULL);
#endif
abts_run_test(suite, attach_test5, NULL);
return suite;