Skip to content
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

*: Do not check for NULL before using sockunion_free() #5983

Closed
wants to merge 2 commits into from
Closed

*: Do not check for NULL before using sockunion_free() #5983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f415fd
tools: No need to check before sockunion_free()
ton31337 Mar 11, 2020
84e01a5
*: Do not check for NULL before using sockunion_free()
ton31337 Mar 11, 2020
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
11 changes: 2 additions & 9 deletions bgpd/bgp_fsm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,15 +1528,8 @@ int bgp_start(struct peer *peer)
* session
*/
/* Connection information. */
if (peer->su_local) {
sockunion_free(peer->su_local);
peer->su_local = NULL;
}

if (peer->su_remote) {
sockunion_free(peer->su_remote);
peer->su_remote = NULL;
}
sockunion_free(peer->su_local);
sockunion_free(peer->su_remote);

/* Clear remote router-id. */
peer->remote_id.s_addr = INADDR_ANY;
Expand Down
11 changes: 2 additions & 9 deletions bgpd/bgp_network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,15 +696,8 @@ int bgp_connect(struct peer *peer)
/* After TCP connection is established. Get local address and port. */
int bgp_getsockname(struct peer *peer)
{
if (peer->su_local) {
sockunion_free(peer->su_local);
peer->su_local = NULL;
}

if (peer->su_remote) {
sockunion_free(peer->su_remote);
peer->su_remote = NULL;
}
sockunion_free(peer->su_local);
sockunion_free(peer->su_remote);

peer->su_local = sockunion_getsockname(peer->fd);
if (!peer->su_local)
Expand Down
24 changes: 5 additions & 19 deletions bgpd/bgpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,10 +1009,7 @@ static void peer_free(struct peer *peer)
XFREE(MTYPE_BGP_PEER_IFNAME, peer->ifname);

/* Update source configuration. */
if (peer->update_source) {
sockunion_free(peer->update_source);
peer->update_source = NULL;
}
sockunion_free(peer->update_source);

XFREE(MTYPE_PEER_UPDATE_SOURCE, peer->update_if);

Expand Down Expand Up @@ -1340,17 +1337,13 @@ void peer_xfer_config(struct peer *peer_dst, struct peer *peer_src)

/* update-source apply */
if (peer_src->update_source) {
if (peer_dst->update_source)
sockunion_free(peer_dst->update_source);
sockunion_free(peer_dst->update_source);
XFREE(MTYPE_PEER_UPDATE_SOURCE, peer_dst->update_if);
peer_dst->update_source =
sockunion_dup(peer_src->update_source);
} else if (peer_src->update_if) {
XFREE(MTYPE_PEER_UPDATE_SOURCE, peer_dst->update_if);
if (peer_dst->update_source) {
sockunion_free(peer_dst->update_source);
peer_dst->update_source = NULL;
}
sockunion_free(peer_dst->update_source);
peer_dst->update_if =
XSTRDUP(MTYPE_PEER_UPDATE_SOURCE, peer_src->update_if);
}
Expand Down Expand Up @@ -2339,15 +2332,8 @@ int peer_delete(struct peer *peer)
}

/* Local and remote addresses. */
if (peer->su_local) {
sockunion_free(peer->su_local);
peer->su_local = NULL;
}

if (peer->su_remote) {
sockunion_free(peer->su_remote);
peer->su_remote = NULL;
}
sockunion_free(peer->su_local);
sockunion_free(peer->su_remote);

/* Free filter related memory. */
FOREACH_AFI_SAFI (afi, safi) {
Expand Down
3 changes: 1 addition & 2 deletions bgpd/bgpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,8 +1399,7 @@ DECLARE_QOBJ_TYPE(peer)
} while (0)
#define PEER_SU_ATTR_INHERIT(peer, group, attr) \
do { \
if ((peer)->attr) \
sockunion_free((peer)->attr); \
sockunion_free((peer)->attr); \
if ((group)->conf->attr) \
(peer)->attr = sockunion_dup((group)->conf->attr); \
else \
Expand Down
3 changes: 1 addition & 2 deletions lib/nexthop_group.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,7 @@ static void nhgl_delete(struct nexthop_hold *nh)

XFREE(MTYPE_TMP, nh->nhvrf_name);

if (nh->addr)
sockunion_free(nh->addr);
sockunion_free(nh->addr);

XFREE(MTYPE_TMP, nh->labels);

Expand Down
17 changes: 17 additions & 0 deletions tools/coccinelle/sockunion_free.cocci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@@
expression E;
@@

(
sockunion_free(E);
- E = NULL;
|
- if (E)
- {
sockunion_free(E);
- E = NULL;
- }
|
- if (E)
sockunion_free(E);
)