Skip to content

Commit

Permalink
ovn-nbctl: Don't segfault when ovn-northd doesn't configure dynamic a…
Browse files Browse the repository at this point in the history
…ddresses.

When ovn-nbctl is used to configure a logical switch port's addresses, it
does a sanity-check to make sure that a duplicate address isn't being
used.  If a port is configured as "dynamic", ovn-northd is supposed to
populate the "dynamic_addresses" column in the Logical_Switch_Port
table.  If it isn't ovn-nbctl, would dereference a null pointer as part
of the duplicate address check.  This patch checks that "dynamic_addresses"
is actually set first.

Signed-off-by: Justin Pettit <jpettit@ovn.org>
Signed-off-by: 0-day Robot <robot@bytheb.org>
  • Loading branch information
justinpettit authored and ovsrobot committed Mar 4, 2019
1 parent 23a4e01 commit c9711b4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ovn/utilities/ovn-nbctl.c
Expand Up @@ -1489,7 +1489,7 @@ lsp_contains_duplicates(const struct nbrec_logical_switch *ls,
for (size_t j = 0; j < lsp_test->n_addresses; j++) {
struct lport_addresses laddrs_test;
char *addr = lsp_test->addresses[j];
if (is_dynamic_lsp_address(addr)) {
if (is_dynamic_lsp_address(addr) && lsp_test->dynamic_addresses) {
addr = lsp_test->dynamic_addresses;
}
if (extract_lsp_addresses(addr, &laddrs_test)) {
Expand Down

0 comments on commit c9711b4

Please sign in to comment.