Skip to content

ipv4defrag: fix segfault #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
p1-gdd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ipv4defrag: fix segfault #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/ipv4defrag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,17 @@ unsigned int ntoh_ipv4_get_tuple4 ( struct ip *ip , pntoh_ipv4_tuple4_t tuple )

unsigned short ipv4_equal_tuple ( void *a , void *b )
{
unsigned short ret = 0;

if ( ! memcmp ( a , (void*)&((pntoh_ipv4_flow_t)b)->ident , sizeof ( ntoh_ipv4_tuple4_t) ) )
ret++;

return ret;
pntoh_ipv4_tuple4_t tuple_a = a;
pntoh_ipv4_tuple4_t tuple_b = (void*)&((pntoh_ipv4_flow_t)b)->ident;
if (
(tuple_a->source == tuple_b->source) &&
(tuple_a->destination == tuple_b->destination) &&
(tuple_a->protocol == tuple_b->protocol) &&
(tuple_a->id == tuple_b->id)
) {
return 1;
}
return 0;
}

pntoh_ipv4_flow_t ntoh_ipv4_find_flow ( pntoh_ipv4_session_t session , pntoh_ipv4_tuple4_t tuple4 )
Expand Down Expand Up @@ -559,6 +564,7 @@ inline static void __ipv4_free_session ( pntoh_ipv4_session_t session )

while ( ( first = htable_first ( session->flows ) ) != 0 )
{
item = htable_find(session->flows, first, NULL);
lock_access ( &item->lock );
__ipv4_free_flow ( session , &item , NTOH_REASON_EXIT );
}
Expand Down