Skip to content

Commit

Permalink
fs: dlm: check on existing node address
Browse files Browse the repository at this point in the history
This patch checks if we add twice the same address to a per node address
array. This should never be the case and we report -EEXIST to the user
space.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
  • Loading branch information
Alexander Aring authored and David Teigland committed Nov 10, 2020
1 parent 40c6b83 commit 4f19d07
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions fs/dlm/lowcomms.c
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,25 @@ static int addr_to_nodeid(struct sockaddr_storage *addr, int *nodeid)
return rv;
}

/* caller need to held dlm_node_addrs_spin lock */
static bool dlm_lowcomms_na_has_addr(const struct dlm_node_addr *na,
const struct sockaddr_storage *addr)
{
int i;

for (i = 0; i < na->addr_count; i++) {
if (addr_compare(na->addr[i], addr))
return true;
}

return false;
}

int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr, int len)
{
struct sockaddr_storage *new_addr;
struct dlm_node_addr *new_node, *na;
bool ret;

new_node = kzalloc(sizeof(struct dlm_node_addr), GFP_NOFS);
if (!new_node)
Expand All @@ -402,6 +417,14 @@ int dlm_lowcomms_addr(int nodeid, struct sockaddr_storage *addr, int len)
return 0;
}

ret = dlm_lowcomms_na_has_addr(na, addr);
if (ret) {
spin_unlock(&dlm_node_addrs_spin);
kfree(new_addr);
kfree(new_node);
return -EEXIST;
}

if (na->addr_count >= DLM_MAX_ADDR_COUNT) {
spin_unlock(&dlm_node_addrs_spin);
kfree(new_addr);
Expand Down

0 comments on commit 4f19d07

Please sign in to comment.