Skip to content

fix use-after-free in local printing if dumping after flushing interface. #124

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
tinselcity wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

fix use-after-free in local printing if dumping after flushing interface. #124

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ int
flush_interface(char *ifname)
{
struct interface *ifp, *prev;
struct neighbour *neigh;

prev = NULL;
ifp = interfaces;
Expand All @@ -114,6 +115,18 @@ flush_interface(char *ifname)
if(ifp == NULL)
return 0;

/* flush any neighbours associated with interface */
neigh = neighs;
while(neigh) {
if(neigh->ifp == ifp) {
struct neighbour *old = neigh;
neigh = neigh->next;
flush_neighbour(old);
continue;
}
neigh = neigh->next;
}

interface_updown(ifp, 0);
if(prev)
prev->next = ifp->next;
Expand Down
2 changes: 1 addition & 1 deletion neighbour.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ find_neighbour_nocreate(const unsigned char *address, struct interface *ifp)
return NULL;
}

static void
void
flush_neighbour(struct neighbour *neigh)
{
flush_neighbour_routes(neigh);
Expand Down
1 change: 1 addition & 0 deletions neighbour.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ struct neighbour *find_neighbour(const unsigned char *address,
int update_neighbour(struct neighbour *neigh, struct hello_history *hist,
int unicast, int hello, int hello_interval);
unsigned check_neighbours(void);
void flush_neighbour(struct neighbour *neigh);
unsigned neighbour_txcost(struct neighbour *neigh);
unsigned neighbour_rxcost(struct neighbour *neigh);
unsigned neighbour_rttcost(struct neighbour *neigh);
Expand Down