Merge pull request #2250 from tych0/check-module-rwx

check-kernel-config: check for STRICT_MODULE_RWX too
This commit is contained in:
Justin Cormack 2017-07-24 16:14:12 +01:00 committed by GitHub
commit 83b23e41d6
4 changed files with 4 additions and 3 deletions

View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
onboot:
- name: check-kernel-config
image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76
image: linuxkit/test-kernel-config:9f0b6b012ad86f22d6ad488cdd870a37fa70bc75
- name: poweroff
image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
command: ["/bin/sh", "/poweroff.sh", "3"]

View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
onboot:
- name: check-kernel-config
image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76
image: linuxkit/test-kernel-config:9f0b6b012ad86f22d6ad488cdd870a37fa70bc75
- name: poweroff
image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
command: ["/bin/sh", "/poweroff.sh", "3"]

View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
onboot:
- name: check-kernel-config
image: linuxkit/test-kernel-config:7e8bcae3e661f5b48c00cf2f15bbef19b35fac76
image: linuxkit/test-kernel-config:9f0b6b012ad86f22d6ad488cdd870a37fa70bc75
- name: poweroff
image: linuxkit/poweroff:bce51402e293da0b653923a43c3c7be6e0effa05
command: ["/bin/sh", "/poweroff.sh", "3"]

View File

@ -73,6 +73,7 @@ fi
if [ "$kernelMajor" -ge 4 -a "$kernelMinor" -ge 11 ]; then
echo $UNZIPPED_CONFIG | grep -q CONFIG_STRICT_KERNEL_RWX=y || fail "CONFIG_STRICT_KERNEL_RWX=y"
echo $UNZIPPED_CONFIG | grep -q CONFIG_STRICT_MODULE_RWX=y || fail "CONFIG_STRICT_MODULE_RWX=y"
fi
# Negative cases