SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/mount: replace invalid UTF-8 code points in "what" and "options"

Browse Source 
Previously, these strings were copied w/o any modification. However, if
mount table contained e.g. remote fs mount like NFS or CIFS that was
mounted from server running with non UTF-8 locale then those strings
might have contained some non UTF-8 characters.

If then client asked about status of such mount unit we tried to forward
these non UTF-8 strings over D-Bus. That is the violation of the
protocol and we ended up kicked from the bus.
This commit is contained in:
Michal Sekletar
2023-05-10 00:01:32 +01:00
committed by Luca Boccassi
parent 539af5c441
commit aaf7b0e411
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mount.c
+29 -6
View File
@@ -34,6 +34,7 @@
#include "strv.h"
#include "unit-name.h"
#include "unit.h"
#include "utf8.h"
#define RETRY_UMOUNT_MAX 32
@@ -274,13 +275,35 @@ static int update_parameters_proc_self_mountinfo(
p = &m->parameters_proc_self_mountinfo;
r = free_and_strdup(&p->what, what);
if (r < 0)
return r;
if (what && !utf8_is_valid(what)) {
_cleanup_free_ char *what_escaped = NULL;
q = free_and_strdup(&p->options, options);
if (q < 0)
return q;
what_escaped = utf8_escape_invalid(what);
if (!what_escaped)
return -ENOMEM;
r = !streq_ptr(p->what, what_escaped);
free_and_replace(p->what, what_escaped);
} else {
r = free_and_strdup(&p->what, what);
if (r < 0)
return r;
}
if (options && !utf8_is_valid(options)) {
_cleanup_free_ char *options_escaped = NULL;
options_escaped = utf8_escape_invalid(options);
if (!options_escaped)
return -ENOMEM;
q = !streq_ptr(p->options, options_escaped);
free_and_replace(p->options, options_escaped);
} else {
q = free_and_strdup(&p->options, options);
if (q < 0)
return q;
}
w = free_and_strdup(&p->fstype, fstype);
if (w < 0)