b2b_entities: free key returned by client_new

prevent pkg leak of b2b_key returned by client_new (cherry picked from commit 60043ae)
OpenSIPS · Aug 22, 2022 · 5fa00d1 · 5fa00d1
1 parent 3d42cc2
commit 5fa00d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/modules/b2b_entities/dlg.c b/modules/b2b_entities/dlg.c
@@ -246,6 +246,7 @@ str* b2b_htable_insert(b2b_table table, b2b_dlg_t* dlg, int hash_index,
 			LM_ERR("No more shared memory\n");
 			if(!safe)
 				lock_release(&table[hash_index].lock);
+			pkg_free(b2b_key);
 			return 0;
 		}
 		memcpy(dlg->tag[CALLEE_LEG].s, b2b_key->s, b2b_key->len);

diff --git a/modules/media_exchange/media_exchange.c b/modules/media_exchange/media_exchange.c
@@ -333,9 +333,11 @@ static int handle_media_fork_to_uri(struct media_session_leg *msl, struct socket
 		LM_ERR("could not copy b2b client key\n");
 		/* key is not yet stored, so cannot be deleted */
 		media_b2b.entity_delete(B2B_CLIENT, b2b_key, NULL, 1, 1);
+		pkg_free(b2b_key);
 		goto release;
 	}
 	msl->params = mf;
+	pkg_free(b2b_key);
 	msl->b2b_entity = B2B_CLIENT;
 	media_util_release_static();
 	return 1;
@@ -614,8 +616,10 @@ static int handle_media_exchange_from_uri(struct socket_info *si, struct dlg_cel
 		LM_ERR("could not copy b2b client key\n");
 		/* key is not yet stored, so cannot be deleted */
 		media_b2b.entity_delete(B2B_CLIENT, b2b_key, NULL, 1, 1);
+		pkg_free(b2b_key);
 		goto unref;
 	}
+	pkg_free(b2b_key);
 	msl->b2b_entity = B2B_CLIENT;
 	return 1;
 unref:

diff --git a/modules/siprec/siprec_logic.c b/modules/siprec/siprec_logic.c
@@ -406,10 +406,12 @@ static int srs_send_invite(struct src_sess *sess)
 	sess->b2b_key.s = shm_malloc(client->len);
 	if (!sess->b2b_key.s) {
 		LM_ERR("out of shm memory!\n");
+		pkg_free(client);
 		return -1;
 	}
 	memcpy(sess->b2b_key.s, client->s, client->len);
 	sess->b2b_key.len = client->len;
+	pkg_free(client);
 
 	return 0;
 }