pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-08 18:33:13 +02:00
Code Activity

Fix read-after-free when linking in a server (that is fully authenticated)

Browse Source 
when there is already another established link with a server with the same name.
For example, when there is a network issue and the "old server" is still
waiting to be timed out and the "new server" is already linking in.
This commit is contained in:
Bram Matthys
2022-10-01 08:48:44 +02:00
parent 8b0b3d70ff
commit 3de3087c95
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/h.h
+1 -1
View File
@@ -148,7 +148,7 @@ extern ConfigItem_listen *find_listen(const char *ipmask, int port, SocketType s
extern ConfigItem_sni *find_sni(const char *name);
extern ConfigItem_ulines *find_uline(const char *host);
extern ConfigItem_tld *find_tld(Client *cptr);
extern ConfigItem_link *find_link(const char *servername, Client *acptr);
extern ConfigItem_link *find_link(const char *servername);
extern ConfigItem_ban *find_ban(Client *, const char *host, short type);
extern ConfigItem_ban *find_banEx(Client *,const char *host, short type, short type2);
extern ConfigItem_vhost *find_vhost(const char *name);
src/conf.c
+3 -4
View File
@@ -3066,15 +3066,14 @@ ConfigItem_tld *find_tld(Client *client)
return NULL;
}
ConfigItem_link *find_link(const char *servername, Client *client)
/** Find a link block by server name (but don't check any restrictions like IP or auth) */
ConfigItem_link *find_link(const char *servername)
{
ConfigItem_link *link;
for (link = conf_link; link; link = link->next)
{
if (match_simple(link->servername, servername) &&
user_allowed_by_security_group(client, link->incoming.match))
if (!link->flag.temporary && match_simple(link->servername, servername))
{
return link;
}
src/modules/server.c
+2 -6
View File
@@ -684,9 +684,7 @@ ConfigItem_link *_verify_link(Client *client)
goto skip_host_check;
} else {
/* Hunt the linkblock down ;) */
for(link = conf_link; link; link = link->next)
if (match_simple(link->servername, client->name))
break;
link = find_link(client->name);
}
if (!link)
@@ -707,9 +705,7 @@ ConfigItem_link *_verify_link(Client *client)
}
orig_link = link;
link = find_link(client->name, client);
if (!link)
if (!user_allowed_by_security_group(client, link->incoming.match))
{
unreal_log(ULOG_ERROR, "link", "LINK_DENIED_INCOMING_MASK_MISMATCH", client,
"Link with server $client.details denied: Server is in link block but link::incoming::mask didn't match",