forked from pool/systemd
0e288fc9c5
- Add upstream patch 0001-machine-don-t-return-uninitialized-variable.patch - Port and add upstream patch 0002-vconsole-setup-run-setfont-before-loadkeys.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Port and add upstream patches 0001-udev-net_setup_link-add-a-bit-more-logging.patch 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch 0002-namespace-fix-uninitialized-memory-access.patch - Add upstream patches 0001-architecture-Add-tilegx.patch 0002-architecture-Add-cris.patch 0003-arch-add-crisv32-to-uname-check.patch 0004-architecture-remove-cris-from-uname-list.patch - Add upstream patches 0006-hwdb-update.patch 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch - Add upstream patches 0001-parse_uid-return-ENXIO-for-1-uids.patch 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch 0003-localed-consider-an-unset-model-as-a-wildcard.patch 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch OBS-URL: https://build.opensuse.org/request/show/239780 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=191
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
Based on 1f97091d3cb0887c264176b47b0a86c269acf0b5 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Fri, 27 Jun 2014 18:34:37 +0200
|
|
Subject: [PATCH] main: uid_to_name() might fail due to OOM, protect against
|
|
that
|
|
|
|
---
|
|
src/core/main.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- src/core/main.c
|
|
+++ src/core/main.c 2014-07-01 12:25:17.906235000 +0000
|
|
@@ -1525,9 +1525,10 @@ int main(int argc, char *argv[]) {
|
|
log_info("Running in initial RAM disk.");
|
|
|
|
} else {
|
|
- _cleanup_free_ char *t = uid_to_name(getuid());
|
|
- log_debug(PACKAGE_STRING " running in user mode for user "UID_FMT"/%s. (" SYSTEMD_FEATURES ")",
|
|
- getuid(), t);
|
|
+ _cleanup_free_ char *t;
|
|
+
|
|
+ t = uid_to_name(getuid());
|
|
+ log_debug(PACKAGE_STRING " running in user mode for user "UID_FMT"/%s. (" SYSTEMD_FEATURES ")", getuid(), strna(t));
|
|
}
|
|
|
|
if (arg_running_as == SYSTEMD_SYSTEM && !skip_setup) {
|