picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

network: do not assign return value if the parse_fwmark_fwmask() fails 

This also removes redundant logs, and makes input string not copied if
it does not contain '/'.
This commit is contained in:
Yu Watanabe 2020-09-09 04:26:49 +09:00
parent d85b0d69f1
commit c2d6fcb147
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/network/networkd-routing-policy-rule.c
View File

@ -655,31 +655,36 @@ int routing_policy_rule_section_verify(RoutingPolicyRule *rule) {
return 0;
}
static int parse_fwmark_fwmask(const char *s, uint32_t *fwmark, uint32_t *fwmask) {
_cleanup_free_ char *f = NULL;
char *p;
static int parse_fwmark_fwmask(const char *s, uint32_t *ret_fwmark, uint32_t *ret_fwmask) {
_cleanup_free_ char *fwmark_str = NULL;
uint32_t fwmark, fwmask = 0;
const char *slash;
int r;
assert(s);
assert(ret_fwmark);
assert(ret_fwmask);
f = strdup(s);
if (!f)
return -ENOMEM;
p = strchr(f, '/');
if (p)
*p++ = '\0';
r = safe_atou32(f, fwmark);
if (r < 0)
return log_error_errno(r, "Failed to parse RPDB rule firewall mark, ignoring: %s", f);
if (p) {
r = safe_atou32(p, fwmask);
if (r < 0)
return log_error_errno(r, "Failed to parse RPDB rule mask, ignoring: %s", f);
slash = strchr(s, '/');
if (slash) {
fwmark_str = strndup(s, slash - s);
if (!fwmark_str)
return -ENOMEM;
}
r = safe_atou32(fwmark_str ?: s, &fwmark);
if (r < 0)
return r;
if (slash) {
r = safe_atou32(slash + 1, &fwmask);
if (r < 0)
return r;
}
*ret_fwmark = fwmark;
*ret_fwmask = fwmask;
return 0;
}