forked from pool/systemd
0b12bae943
Please checkin also to openSUSE 12.3 - udev: re-add persistent network rules (bnc#809843). add: 1026-re-add-persistent-net.patch - rebase all patches, ensure that they apply properly. OBS-URL: https://build.opensuse.org/request/show/160211 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=134
46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
From ac97e2c559f5d386a332aba4a24bf9930cdb1c51 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Mon, 19 Nov 2012 16:36:38 +0100
|
|
Subject: [PATCH] core/load-fragment: fix (potential) bad memory access
|
|
|
|
strncmp() could be used with size bigger then the size of the string,
|
|
because MAX was used instead of MIN.
|
|
|
|
If failing, print just the offending mount flag.
|
|
---
|
|
src/core/load-fragment.c | 17 ++++++++++++-----
|
|
1 file changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
Index: systemd-195/src/core/load-fragment.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/core/load-fragment.c
|
|
+++ systemd-195/src/core/load-fragment.c
|
|
@@ -1083,15 +1083,22 @@ int config_parse_exec_mount_flags(
|
|
assert(rvalue);
|
|
assert(data);
|
|
|
|
- FOREACH_WORD_QUOTED(w, l, rvalue, state) {
|
|
- if (strncmp(w, "shared", MAX(l, 6U)) == 0)
|
|
+ FOREACH_WORD_SEPARATOR(w, l, rvalue, ", ", state) {
|
|
+ char _cleanup_free_ *t;
|
|
+
|
|
+ t = strndup(w, l);
|
|
+ if (!t)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ if (streq(t, "shared"))
|
|
flags |= MS_SHARED;
|
|
- else if (strncmp(w, "slave", MAX(l, 5U)) == 0)
|
|
+ else if (streq(t, "slave"))
|
|
flags |= MS_SLAVE;
|
|
- else if (strncmp(w, "private", MAX(l, 7U)) == 0)
|
|
+ else if (streq(w, "private"))
|
|
flags |= MS_PRIVATE;
|
|
else {
|
|
- log_error("[%s:%u] Failed to parse mount flags, ignoring: %s", filename, line, rvalue);
|
|
+ log_error("[%s:%u] Failed to parse mount flag %s, ignoring: %s",
|
|
+ filename, line, t, rvalue);
|
|
return 0;
|
|
}
|
|
}
|