osmocom
/
libosmo-abis
mirror of https://gerrit.osmocom.org/libosmo-abis
11
0
Fork 0
Code Issues Releases Wiki Activity

ipa: ipa_server_link_close() add checks of link state 

When closing a link which failed on open,
ipa_server_link_close() would crash it when calling osmo_fd_unregister.

Change-Id: I672d4de25464c3829b08aff26b1a6d4ad92e7684
This commit is contained in:
Alexander Couzens 2019-08-28 02:35:10 +02:00
parent 30249a15d5
commit e11afdaa0e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/input/ipa.c
View File

@ -297,6 +297,7 @@ ipa_server_link_create(void *ctx, struct e1inp_line *line,
ipa_link->ofd.when |= BSC_FD_READ | BSC_FD_WRITE;
ipa_link->ofd.cb = ipa_server_fd_cb;
ipa_link->ofd.fd = -1;
ipa_link->ofd.data = ipa_link;
if (addr)
ipa_link->addr = talloc_strdup(ipa_link, addr);
@ -326,6 +327,7 @@ int ipa_server_link_open(struct ipa_server_link *link)
link->ofd.fd = ret;
if (osmo_fd_register(&link->ofd) < 0) {
close(ret);
link->ofd.fd = -1;
return -EIO;
}
return 0;
@ -333,8 +335,12 @@ int ipa_server_link_open(struct ipa_server_link *link)
void ipa_server_link_close(struct ipa_server_link *link)
{
if (link->ofd.fd == -1)
return;
osmo_fd_unregister(&link->ofd);
close(link->ofd.fd);
link->ofd.fd = -1;
}
static int ipa_server_conn_read(struct ipa_server_conn *conn)