2017-01-31 17:11:17 +00:00
|
|
|
From b6700f38b414fa8e97a29fae221d8f02af4b3375 Mon Sep 17 00:00:00 2001
|
2017-01-29 22:22:41 +00:00
|
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
|
|
Date: Fri, 27 Jan 2017 00:45:38 -0500
|
|
|
|
|
Subject: [PATCH] nspawn: fix clobbering of selinux context arg
|
|
|
|
|
|
|
|
|
|
First bug fixed by gcc 7. Yikes.
|
|
|
|
|
|
|
|
|
|
(cherry picked from commit 2e8977b198882fb8c99366ab2944572aa8998dc0)
|
|
|
|
|
---
|
|
|
|
|
src/nspawn/nspawn.c | 3 +--
|
|
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
|
|
|
|
index 503265545b..0e2f4d59a5 100644
|
|
|
|
|
--- a/src/nspawn/nspawn.c
|
|
|
|
|
+++ b/src/nspawn/nspawn.c
|
|
|
|
|
@@ -658,9 +658,8 @@ static int parse_argv(int argc, char *argv[]) {
|
|
|
|
|
r = free_and_strdup(&arg_machine, optarg);
|
|
|
|
|
if (r < 0)
|
|
|
|
|
return log_oom();
|
|
|
|
|
-
|
|
|
|
|
- break;
|
|
|
|
|
}
|
|
|
|
|
+ break;
|
|
|
|
|
|
|
|
|
|
case 'Z':
|
|
|
|
|
arg_selinux_context = optarg;
|
