picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn-oci: mount source is optional

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-03-22 12:04:32 +01:00
parent b2e07b1a02
commit b1f13b0e75
2 changed files with 93 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nspawn/nspawn-oci.c
View file

@ -569,7 +569,7 @@ static int oci_mounts(const char *name, JsonVariant *v, JsonDispatchFlags flags,
}
if (!data.type || streq(data.type, "bind")) {
if (!path_is_absolute(data.source)) {
if (data.source && !path_is_absolute(data.source)) {
char *joined;
joined = path_join(s->bundle, data.source);

92
test/fuzz/fuzz-nspawn-oci/crash-db0595479ee2e625fa5419a821009b5eb4d809b7 Normal file
View file

@ -0,0 +1,92 @@
{
"ociVersion": "1.0.0",
"root": {
"path": "rootfs",
"readonly": true
},
"process": {
"terminal": false,
"consoleSize": {
"height":6667,
"width":6668
},
"user": {
"uid": 14,
"gid": 14,
"additionalGids": [59, 81]
},
"args": [
"/tmp/verify.sh"
],
"env": [
"FOO=BAR",
"WITHSPACES=FOO BAR",
"WITHSHELLCHARS=$ASDF \\\"asdf asdf\\\" !",
"WITHCONTROLCHARS=\\123\\125\\010\\020",
"TERM=xterm"
],
"cwd": "/tmp/src",
"rlimits": [
{
"type": "RLIMIT_NOFILE",
"hard": 1020,
"soft": 1020
}
]
},
"mounts": [
{
"destination": "/tmp/src" },
{
"source": "sysfs",
"options": [
"mode=777"
]
},
{
"destination": "/sys/fs/cgroup",
"type": "cgroup",
"source": "cgroup",
"options": [
"mode=777"
]
}
],
"hooks": {},
"linux": {
"resources": {
"devices": [
{
"allow": false,
"access": "rwm"
}
]
},
"namespaces": [
{
"type": "pid"
},
{
"type": "ipc"
},
{
"type": "mount"
}
]
},
"annotations": {
"com.example.key1": "value1",
"com.example.key2": "value2"
}
}