RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1030 from joe-lawrence/verify-patch-files 

kpatch-build: sanity check patched filenames
This commit is contained in:
Joe Lawrence 2019-09-03 10:19:08 -04:00 committed by GitHub
parent debf44a0f1 e4525ce311
commit 0507ea2bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -40,7 +40,7 @@ sudo dnf install gcc kernel-devel-${UNAME%.*} elfutils elfutils-devel
Install the dependencies for the "kpatch-build" command:
```bash
sudo dnf install pesign yum-utils openssl wget numactl-devel
sudo dnf install pesign yum-utils openssl wget numactl-devel patchutils
sudo dnf builddep kernel-${UNAME%.*}
sudo dnf debuginfo-install kernel-${UNAME%.*}
@ -50,9 +50,6 @@ sudo dnf install gcc-plugin-devel
# optional, but highly recommended
sudo dnf install ccache
ccache --max-size=5G
# optional, for kpatch-test
sudo dnf install patchutils
```
#### RHEL 7
@ -73,7 +70,8 @@ Install the dependencies for the "kpatch-build" command:
sudo yum-config-manager --enable rhel-7-server-optional-rpms
sudo yum install pesign yum-utils zlib-devel \
binutils-devel newt-devel python-devel perl-ExtUtils-Embed \
audit-libs-devel numactl-devel pciutils-devel bison ncurses-devel
audit-libs-devel numactl-devel pciutils-devel bison ncurses-devel \
patchutils
sudo yum-builddep kernel-${UNAME%.*}
sudo debuginfo-install kernel-${UNAME%.*}
@ -84,9 +82,6 @@ sudo yum install gcc-plugin-devel
# optional, but highly recommended
sudo yum install https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm
ccache --max-size=5G
# optional, for kpatch-test
sudo yum install patchutils
```
#### CentOS 7
@ -106,7 +101,7 @@ Install the dependencies for the "kpatch-build" command:
```bash
sudo yum install pesign yum-utils zlib-devel \
binutils-devel newt-devel python-devel perl-ExtUtils-Embed \
audit-libs audit-libs-devel numactl-devel pciutils-devel bison
audit-libs audit-libs-devel numactl-devel pciutils-devel bison patchutils
# enable CentOS 7 debug repo
sudo yum-config-manager --enable debug
@ -117,9 +112,6 @@ sudo debuginfo-install kernel-${UNAME%.*}
# optional, but highly recommended - enable EPEL 7
sudo yum install ccache
ccache --max-size=5G
# optional, for kpatch-test
sudo yum install patchutils
```
#### Oracle Linux 7
@ -139,7 +131,7 @@ Install the dependencies for the "kpatch-build" command:
```bash
sudo yum install pesign yum-utils zlib-devel \
binutils-devel newt-devel python-devel perl-ExtUtils-Embed \
audit-libs numactl-devel pciutils-devel bison
audit-libs numactl-devel pciutils-devel bison patchutils
# enable ol7_optional_latest repo
sudo yum-config-manager --enable ol7_optional_latest
@ -153,9 +145,6 @@ rpm -ivh https://oss.oracle.com/ol7/debuginfo/kernel-debuginfo-common-x86_64-$(u
# optional, but highly recommended - enable EPEL 7
sudo yum install ccache
ccache --max-size=5G
# optional, for kpatch-test
sudo yum install patchutils
```
#### Ubuntu

28
kpatch-build/kpatch-build
View File

@ -88,6 +88,33 @@ logger() {
fi
}
verify_patch_files() {
local path
local dir
local ret=0
for patch in "${PATCH_LIST[@]}"; do
for path in $(lsdiff "$patch" 2>/dev/null); do
dir=$(dirname "$path")
ext="${path##*.}"
if [[ "$dir" =~ ^lib$ ]] || [[ "$dir" =~ ^lib/ ]] ; then
warn "$patch: unsupported patch to lib/: $path"
ret=1
fi
if [[ "$ext" == "S" ]] ; then
warn "$patch: unsupported patch to assembly: $path"
ret=1
fi
done
done
[[ $ret == 1 ]] && die "Unsupported changes detected"
}
apply_patches() {
local patch
@ -746,6 +773,7 @@ grep -q "CONFIG_GCC_PLUGIN_RANDSTRUCT=y" "$CONFIGFILE" && die "kernel option 'CO
echo "Testing patch file(s)"
cd "$SRCDIR" || die
verify_patch_files
apply_patches
remove_patches