a0e2ca72a7
Resolves: #1719364,#2156751,#2156786,#2158724,#2169932,#2172846,#2178179,#2179309,#2180380,#2209328,#2217786
109 lines
3.7 KiB
Diff
109 lines
3.7 KiB
Diff
From 048c335acdaaba173574305c9b03677b3fde999f Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Thu, 11 May 2023 19:21:57 +0900
|
|
Subject: [PATCH] core/mount: escape invalid UTF8 char in dbus reply
|
|
|
|
When What= or Options= may contain invalid UTF8 chars.
|
|
|
|
Replaces aaf7b0e41105d7b7cf30912cdac32820f011a219 (#27541).
|
|
|
|
(cherry picked from commit 4804da58536ab7ad46178a03f4d2da49fd8e4ba2)
|
|
|
|
Resolves: #2158724
|
|
---
|
|
src/core/dbus-mount.c | 69 +++++++++++++++++++++++++++++++++++--------
|
|
1 file changed, 57 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
|
|
index 3f98d3ecf0..a089b37e04 100644
|
|
--- a/src/core/dbus-mount.c
|
|
+++ b/src/core/dbus-mount.c
|
|
@@ -9,21 +9,68 @@
|
|
#include "mount.h"
|
|
#include "string-util.h"
|
|
#include "unit.h"
|
|
+#include "utf8.h"
|
|
+
|
|
+static int property_get_what(
|
|
+ sd_bus *bus,
|
|
+ const char *path,
|
|
+ const char *interface,
|
|
+ const char *property,
|
|
+ sd_bus_message *reply,
|
|
+ void *userdata,
|
|
+ sd_bus_error *error) {
|
|
+
|
|
+ _cleanup_free_ char *escaped = NULL;
|
|
+ Mount *m = userdata;
|
|
+ const char *s = NULL;
|
|
+
|
|
+ assert(bus);
|
|
+ assert(reply);
|
|
+ assert(m);
|
|
|
|
-static const char *mount_get_what(const Mount *m) {
|
|
if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.what)
|
|
- return m->parameters_proc_self_mountinfo.what;
|
|
- if (m->from_fragment && m->parameters_fragment.what)
|
|
- return m->parameters_fragment.what;
|
|
- return NULL;
|
|
+ s = m->parameters_proc_self_mountinfo.what;
|
|
+ else if (m->from_fragment && m->parameters_fragment.what)
|
|
+ s = m->parameters_fragment.what;
|
|
+
|
|
+ if (s) {
|
|
+ escaped = utf8_escape_invalid(s);
|
|
+ if (!escaped)
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
+ return sd_bus_message_append_basic(reply, 's', escaped);
|
|
}
|
|
|
|
-static const char *mount_get_options(const Mount *m) {
|
|
+static int property_get_options(
|
|
+ sd_bus *bus,
|
|
+ const char *path,
|
|
+ const char *interface,
|
|
+ const char *property,
|
|
+ sd_bus_message *reply,
|
|
+ void *userdata,
|
|
+ sd_bus_error *error) {
|
|
+
|
|
+ _cleanup_free_ char *escaped = NULL;
|
|
+ Mount *m = userdata;
|
|
+ const char *s = NULL;
|
|
+
|
|
+ assert(bus);
|
|
+ assert(reply);
|
|
+ assert(m);
|
|
+
|
|
if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.options)
|
|
- return m->parameters_proc_self_mountinfo.options;
|
|
- if (m->from_fragment && m->parameters_fragment.options)
|
|
- return m->parameters_fragment.options;
|
|
- return NULL;
|
|
+ s = m->parameters_proc_self_mountinfo.options;
|
|
+ else if (m->from_fragment && m->parameters_fragment.options)
|
|
+ s = m->parameters_fragment.options;
|
|
+
|
|
+ if (s) {
|
|
+ escaped = utf8_escape_invalid(s);
|
|
+ if (!escaped)
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
+ return sd_bus_message_append_basic(reply, 's', escaped);
|
|
}
|
|
|
|
static const char *mount_get_fstype(const Mount *m) {
|
|
@@ -34,8 +81,6 @@ static const char *mount_get_fstype(const Mount *m) {
|
|
return NULL;
|
|
}
|
|
|
|
-static BUS_DEFINE_PROPERTY_GET(property_get_what, "s", Mount, mount_get_what);
|
|
-static BUS_DEFINE_PROPERTY_GET(property_get_options, "s", Mount, mount_get_options);
|
|
static BUS_DEFINE_PROPERTY_GET(property_get_type, "s", Mount, mount_get_fstype);
|
|
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, mount_result, MountResult);
|
|
|