shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

sd-ndisc: make sd_ndisc_router_dnssl_get_domains() return -EBADMSG when received invalid domain name

Browse Source 
Fixes #31168.
This commit is contained in:
Yu Watanabe 2024-02-02 10:23:56 +09:00
parent 3092bd7aa1
commit 6244184e3f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libsystemd-network/ndisc-router.c
View File

@ -9,6 +9,7 @@
#include "alloc-util.h"
#include "dns-domain.h"
#include "escape.h"
#include "hostname-util.h"
#include "memory-util.h"
#include "missing_network.h"
@ -716,8 +717,12 @@ int sd_ndisc_router_dnssl_get_domains(sd_ndisc_router *rt, char ***ret) {
e[n] = 0;
r = dns_name_normalize(e, 0, &normalized);
if (r < 0)
return r;
if (r < 0) {
_cleanup_free_ char *escaped = cescape(e);
log_debug_errno(r, "Failed to normalize advertised domain name \"%s\": %m", strna(escaped));
/* Here, do not propagate error code from dns_name_normalize() except for ENOMEM. */
return r == -ENOMEM ? -ENOMEM : -EBADMSG;
}
/* Ignore the root domain name or "localhost" and friends */
if (!is_localhost(normalized) &&
@ -753,8 +758,12 @@ int sd_ndisc_router_dnssl_get_domains(sd_ndisc_router *rt, char ***ret) {
e[n++] = '.';
r = dns_label_escape((char*) p+1, *p, e + n, DNS_LABEL_ESCAPED_MAX);
if (r < 0)
return r;
if (r < 0) {
_cleanup_free_ char *escaped = cescape_length((const char*) p+1, *p);
log_debug_errno(r, "Failed to escape advertised domain name \"%s\": %m", strna(escaped));
/* Here, do not propagate error code from dns_label_escape() except for ENOMEM. */
return r == -ENOMEM ? -ENOMEM : -EBADMSG;
}
n += r;