From 2d6e0a7e12e2aefc1cad2c914ef11a16e631c943 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 16 Aug 2024 11:08:11 +0800 Subject: [PATCH 1/3] add generate patch script Signed-off-by: renoseven (cherry picked from commit 2901ec3d3ce68ece2d1c9a2f4cbba9ae457fc0fa) --- generate_patches.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 generate_patches.sh diff --git a/generate_patches.sh b/generate_patches.sh new file mode 100755 index 0000000..b0f1ee9 --- /dev/null +++ b/generate_patches.sh @@ -0,0 +1,55 @@ +#!/bin/bash -e +readonly ROOT_DIR="$(dirname $(readlink -f ${BASH_SOURCE[0]}))" + +readonly SPEC_FILE="$(find . -name '*.spec' | head -n 1)" +readonly REPO_NAME="$(basename ${SPEC_FILE} | sed 's/.spec//')" +readonly REPO_VERSION="$(grep Version ${SPEC_FILE} | head -n 1 | awk -F ' ' '{print $NF}')" +readonly REPO_REMOTE="origin" + +readonly PKG_NAME="${REPO_NAME}-${REPO_VERSION}" +readonly PKG_DIR="${ROOT_DIR}/${PKG_NAME}" +readonly PKG_BRANCH="$(git branch --show-current | sed 's/-LTS.*//')" + +echo "Preparing..." +# clean old files +rm -f ${ROOT_DIR}/*.patch +rm -rf ${PKG_DIR} + +# extract package +tar -xf ${PKG_NAME}.tar.gz + +# fetch baseline +pushd ${PKG_DIR} > /dev/null +readonly PKG_BASELINE=$(git rev-parse --short HEAD) +popd > /dev/null + +echo "------------------------------" +echo "Name: ${PKG_NAME}" +echo "Branch: ${PKG_BRANCH}" +echo "Baseline: ${PKG_BASELINE}" +echo "------------------------------" + +echo "Syncing with remote..." +pushd ${PKG_DIR} > /dev/null +git fetch ${REPO_REMOTE} +popd > /dev/null + +echo "Generating patches..." +# format patches +pushd ${PKG_DIR} > /dev/null +git checkout -q ${REPO_REMOTE}/${PKG_BRANCH} +git format-patch -qN -o ${ROOT_DIR} ${PKG_BASELINE} +popd > /dev/null + +# print patch list +patch_list="$(find ${ROOT_DIR} -maxdepth 1 -name "*.patch" | sort)" +for patch_file in ${patch_list}; do + patch_name="$(basename ${patch_file})" + patch_id="$(echo ${patch_name} | awk -F '-' '{print $1}')" + echo "Patch${patch_id}: ${patch_name}" +done + +echo "Cleaning up..." +rm -rf ${PKG_DIR} + +echo "Done" -- Gitee From b979222579a493d00126c46b714773960cf2c467 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 16 Aug 2024 15:52:40 +0800 Subject: [PATCH 2/3] update scripts Signed-off-by: renoseven (cherry picked from commit 27bb77c6994f901ec8a54ab54b9d143f54905617) --- generate_package.sh | 42 +++++++++++++++++++++++------------------- generate_patches.sh | 33 ++++++++++++++++----------------- 2 files changed, 39 insertions(+), 36 deletions(-) diff --git a/generate_package.sh b/generate_package.sh index 07c0d87..a6f328e 100755 --- a/generate_package.sh +++ b/generate_package.sh @@ -1,25 +1,31 @@ #!/bin/bash -e -readonly REPO_NAME="syscare" -readonly REPO_PROVIDER="openeuler" -readonly REPO_URL="https://gitee.com/$REPO_PROVIDER/$REPO_NAME" -readonly REPO_BRANCH="openEuler-22.03" +readonly SPEC_FILE="$(find . -name '*.spec' | head -n 1)" -echo "Cloning source code..." -repo_version=$(grep "Version" "$REPO_NAME.spec" | head -n 1 | awk -F ' ' '{print $NF}') -repo_dir="$REPO_NAME-$repo_version" +readonly REPO_NAME="$(basename ${SPEC_FILE} | sed 's/.spec//')" +readonly REPO_URL="https://gitee.com/openeuler/${REPO_NAME}" +readonly REPO_BRANCH="$(git branch --show-current | sed 's/-LTS.*//')" +readonly REPO_VERSION="$(grep Version ${SPEC_FILE} | head -n 1 | awk -F ' ' '{print $NF}')" + +readonly PKG_NAME="${REPO_NAME}-${REPO_VERSION}" +readonly PKG_DIR="$(realpath ./${PKG_NAME})" -rm -rf "$REPO_NAME" "$repo_dir" -git clone "$REPO_URL" +echo "Preparing..." +rm -rf ./${REPO_NAME} ./${PKG_NAME} +rm -f ./*.tar.gz -echo "Prepare build requirements..." -pushd "$REPO_NAME" +echo "--------------------------" +echo "Name: ${REPO_NAME}" +echo "Branch: ${REPO_BRANCH}" +echo "--------------------------" -echo "Checking out dest branch..." -git checkout "$REPO_BRANCH" +echo "Cloning source code..." +git clone ${REPO_URL} -b ${REPO_BRANCH} ${PKG_NAME} echo "Vendoring dependencies..." -cargo vendor --respect-source-config --sync Cargo.toml +pushd ${PKG_DIR} > /dev/null + +cargo vendor --quiet --respect-source-config --sync Cargo.toml mkdir -p .cargo cat << EOF > .cargo/config.toml @@ -30,14 +36,12 @@ replace-with = "vendored-sources" directory = "vendor" EOF -popd +popd > /dev/null echo "Compressing package..." -mv "$REPO_NAME" "$repo_dir" -tar -czf "$repo_dir.tar.gz" "$repo_dir" +tar -czf ./${PKG_NAME}.tar.gz ${PKG_NAME} echo "Cleaning up..." -rm -rf "$repo_dir" +rm -rf ${PKG_DIR} echo "Done" - diff --git a/generate_patches.sh b/generate_patches.sh index b0f1ee9..69e31b4 100755 --- a/generate_patches.sh +++ b/generate_patches.sh @@ -1,48 +1,47 @@ #!/bin/bash -e -readonly ROOT_DIR="$(dirname $(readlink -f ${BASH_SOURCE[0]}))" readonly SPEC_FILE="$(find . -name '*.spec' | head -n 1)" + readonly REPO_NAME="$(basename ${SPEC_FILE} | sed 's/.spec//')" +readonly REPO_URL="https://gitee.com/openeuler/${REPO_NAME}" +readonly REPO_BRANCH="$(git branch --show-current | sed 's/-LTS.*//')" readonly REPO_VERSION="$(grep Version ${SPEC_FILE} | head -n 1 | awk -F ' ' '{print $NF}')" -readonly REPO_REMOTE="origin" readonly PKG_NAME="${REPO_NAME}-${REPO_VERSION}" -readonly PKG_DIR="${ROOT_DIR}/${PKG_NAME}" -readonly PKG_BRANCH="$(git branch --show-current | sed 's/-LTS.*//')" +readonly PKG_DIR="$(realpath ./${PKG_NAME})" + +readonly PATCH_DIR="$(pwd)" echo "Preparing..." -# clean old files -rm -f ${ROOT_DIR}/*.patch rm -rf ${PKG_DIR} +rm -f ./*.patch -# extract package -tar -xf ${PKG_NAME}.tar.gz +tar -xf ./${PKG_NAME}.tar.gz -# fetch baseline pushd ${PKG_DIR} > /dev/null -readonly PKG_BASELINE=$(git rev-parse --short HEAD) +readonly REPO_BASELINE="$(git rev-parse --short HEAD)" popd > /dev/null echo "------------------------------" -echo "Name: ${PKG_NAME}" -echo "Branch: ${PKG_BRANCH}" -echo "Baseline: ${PKG_BASELINE}" +echo "Name: ${REPO_NAME}" +echo "Branch: ${REPO_BRANCH}" +echo "Baseline: ${REPO_BASELINE}" echo "------------------------------" echo "Syncing with remote..." pushd ${PKG_DIR} > /dev/null -git fetch ${REPO_REMOTE} +git fetch origin popd > /dev/null echo "Generating patches..." # format patches pushd ${PKG_DIR} > /dev/null -git checkout -q ${REPO_REMOTE}/${PKG_BRANCH} -git format-patch -qN -o ${ROOT_DIR} ${PKG_BASELINE} +git checkout -q origin/${REPO_BRANCH} +git format-patch -qN -o ${PATCH_DIR} ${REPO_BASELINE} popd > /dev/null # print patch list -patch_list="$(find ${ROOT_DIR} -maxdepth 1 -name "*.patch" | sort)" +patch_list="$(find . -maxdepth 1 -name "*.patch" | sort)" for patch_file in ${patch_list}; do patch_name="$(basename ${patch_file})" patch_id="$(echo ${patch_name} | awk -F '-' '{print $1}')" -- Gitee From f67452bd8720d0e78b4dfdbe9c955f5489f62c19 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 16 Aug 2024 10:31:54 +0800 Subject: [PATCH 3/3] update to 1.2.1-10 Signed-off-by: renoseven (cherry picked from commit aaca4c9c5f8db3a4546717038fc2416ba0547eb9) --- 0001-upatch-hijacker-fix-compile-bug.patch | 2 +- ...t-get-file-selinux-xattr-when-selinu.patch | 4 +- ...care-check-command-does-not-check-sy.patch | 4 +- ...not-find-process-of-dynlib-patch-iss.patch | 3 +- ...-syscared-optimize-patch-error-logic.patch | 2 +- ...-optimize-transaction-creation-logic.patch | 2 +- 0007-upatch-manage-optimize-output.patch | 2 +- ...n-impl-CStr-from_bytes_with_next_nul.patch | 2 +- 0009-syscared-improve-patch-management.patch | 2 +- ...tivating-ignored-process-on-new-proc.patch | 4 +- ...adapt-upatch-manage-exit-code-change.patch | 2 +- 0012-upatch-manage-change-exit-code.patch | 2 +- ...ange-the-way-to-calculate-frozen-tim.patch | 2 +- ...abi-change-uuid-string-to-uuid-bytes.patch | 2 +- ...-file-detection-cause-build-failure-.patch | 3 +- 0016-upatch-diff-optimize-log-output.patch | 2 +- ...security-change-directory-permission.patch | 2 +- ...rity-change-daemon-socket-permission.patch | 2 +- ...xed-the-core-dump-issue-after-applyi.patch | 4 +- ...ch-diff-fix-lookup_relf-failed-issue.patch | 2 +- ...diff-only-check-changed-file-symbols.patch | 4 +- ...ve-rela-check-while-build-rebuilding.patch | 4 +- ...ly-kernel-module-patch-failure-issue.patch | 2 +- ...d-fix-build-oot-module-failure-issue.patch | 2 +- ...xecutable-from-environment-variables.patch | 241 ++ 0026-all-remove-redundant-code.patch | 901 ++++++ 0027-abi-reexport-uuid.patch | 37 + 0028-all-add-c-rust-compilation-options.patch | 2283 +++++++++++++++ ...x-failed-to-set-selinux-status-issue.patch | 32 + ...-with-error-when-any-tls-var-include.patch | 48 + ...ff-fix-lookup_relf-duplicate-failure.patch | 34 + 0032-upatch-diff-fix-memory-leak.patch | 611 ++++ 0033-upatch-hijacker-fix-memory-leak.patch | 43 + 0034-upatch-manage-fix-memory-leak.patch | 113 + 0035-security-sanitize-sensitive-code.patch | 1989 +++++++++++++ 0036-all-implement-asan-gcov-build-type.patch | 242 ++ 0037-all-clean-code.patch | 2498 +++++++++++++++++ ...i-remove-display-limit-of-patch_info.patch | 62 + 0039-syscare-abi-fix-clippy-warnings.patch | 49 + 0040-update-README.md.patch | 30 + ...ff-fix-.rela.text-section-status-bug.patch | 46 + 0042-upatch-manage-resolve-plt-firstly.patch | 34 + ...ch-manage-fix-find-upatch-region-bug.patch | 261 ++ 0044-update-README.md.patch | 26 + ...lize-empty-path-return-current-path-.patch | 28 + ...TCH_CHECK-action-when-status-change-.patch | 30 + ...ll-fix-compile-failure-of-rustc-1.80.patch | 207 ++ syscare.spec | 128 +- 48 files changed, 9958 insertions(+), 77 deletions(-) create mode 100644 0025-all-finding-executable-from-environment-variables.patch create mode 100644 0026-all-remove-redundant-code.patch create mode 100644 0027-abi-reexport-uuid.patch create mode 100644 0028-all-add-c-rust-compilation-options.patch create mode 100644 0029-common-fix-failed-to-set-selinux-status-issue.patch create mode 100644 0030-upatch-diff-exit-with-error-when-any-tls-var-include.patch create mode 100644 0031-upatch-diff-fix-lookup_relf-duplicate-failure.patch create mode 100644 0032-upatch-diff-fix-memory-leak.patch create mode 100644 0033-upatch-hijacker-fix-memory-leak.patch create mode 100644 0034-upatch-manage-fix-memory-leak.patch create mode 100644 0035-security-sanitize-sensitive-code.patch create mode 100644 0036-all-implement-asan-gcov-build-type.patch create mode 100644 0037-all-clean-code.patch create mode 100644 0038-syscare-abi-remove-display-limit-of-patch_info.patch create mode 100644 0039-syscare-abi-fix-clippy-warnings.patch create mode 100644 0040-update-README.md.patch create mode 100644 0041-upatch-diff-fix-.rela.text-section-status-bug.patch create mode 100644 0042-upatch-manage-resolve-plt-firstly.patch create mode 100644 0043-upatch-manage-fix-find-upatch-region-bug.patch create mode 100644 0044-update-README.md.patch create mode 100644 0045-common-fix-normalize-empty-path-return-current-path-.patch create mode 100644 0046-syscared-Add-PACTCH_CHECK-action-when-status-change-.patch create mode 100644 0047-all-fix-compile-failure-of-rustc-1.80.patch diff --git a/0001-upatch-hijacker-fix-compile-bug.patch b/0001-upatch-hijacker-fix-compile-bug.patch index 8c3af45..0eed494 100644 --- a/0001-upatch-hijacker-fix-compile-bug.patch +++ b/0001-upatch-hijacker-fix-compile-bug.patch @@ -1,7 +1,7 @@ From 8c09e8b3d9d59012c1019c01ac2246c770501c75 Mon Sep 17 00:00:00 2001 From: ningyu <405888464@qq.com> Date: Sun, 7 Apr 2024 10:50:13 +0800 -Subject: [PATCH 01/20] upatch-hijacker: fix compile bug container_of_safe => +Subject: [PATCH] upatch-hijacker: fix compile bug container_of_safe => container_of --- diff --git a/0002-daemon-fix-cannot-get-file-selinux-xattr-when-selinu.patch b/0002-daemon-fix-cannot-get-file-selinux-xattr-when-selinu.patch index ff84d01..6e1df04 100644 --- a/0002-daemon-fix-cannot-get-file-selinux-xattr-when-selinu.patch +++ b/0002-daemon-fix-cannot-get-file-selinux-xattr-when-selinu.patch @@ -1,8 +1,8 @@ From a535e14a7db49df3c8aab017e32b92d8e5bb4087 Mon Sep 17 00:00:00 2001 From: renoseven Date: Wed, 10 Apr 2024 10:25:21 +0800 -Subject: [PATCH 02/20] daemon: fix 'cannot get file selinux xattr when selinux - is not enforcing' issue +Subject: [PATCH] daemon: fix 'cannot get file selinux xattr when selinux is + not enforcing' issue Signed-off-by: renoseven --- diff --git a/0003-syscared-fix-syscare-check-command-does-not-check-sy.patch b/0003-syscared-fix-syscare-check-command-does-not-check-sy.patch index 754ca30..514fa92 100644 --- a/0003-syscared-fix-syscare-check-command-does-not-check-sy.patch +++ b/0003-syscared-fix-syscare-check-command-does-not-check-sy.patch @@ -1,8 +1,8 @@ From e5294afa8135f54f44196bd92e5a32c2b09b9bda Mon Sep 17 00:00:00 2001 From: renoseven Date: Wed, 10 Apr 2024 12:19:51 +0800 -Subject: [PATCH 03/20] syscared: fix 'syscare check command does not check - symbol confiliction' issue +Subject: [PATCH] syscared: fix 'syscare check command does not check symbol + confiliction' issue Signed-off-by: renoseven --- diff --git a/0004-syscared-fix-cannot-find-process-of-dynlib-patch-iss.patch b/0004-syscared-fix-cannot-find-process-of-dynlib-patch-iss.patch index 317e96c..1bdb55b 100644 --- a/0004-syscared-fix-cannot-find-process-of-dynlib-patch-iss.patch +++ b/0004-syscared-fix-cannot-find-process-of-dynlib-patch-iss.patch @@ -1,8 +1,7 @@ From 32c3d16175b93627504981d05a1a3e3ec603415e Mon Sep 17 00:00:00 2001 From: renoseven Date: Wed, 10 Apr 2024 19:30:56 +0800 -Subject: [PATCH 04/20] syscared: fix 'cannot find process of dynlib patch' - issue +Subject: [PATCH] syscared: fix 'cannot find process of dynlib patch' issue 1. For detecting process mapped dynamic library, we use /proc/$pid/map_files instead. diff --git a/0005-syscared-optimize-patch-error-logic.patch b/0005-syscared-optimize-patch-error-logic.patch index 6449175..3f6ab07 100644 --- a/0005-syscared-optimize-patch-error-logic.patch +++ b/0005-syscared-optimize-patch-error-logic.patch @@ -1,7 +1,7 @@ From a61958c837b70c0c530d32ee58b616ab9ad01f4b Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 12 Apr 2024 11:35:57 +0800 -Subject: [PATCH 05/20] syscared: optimize patch error logic +Subject: [PATCH] syscared: optimize patch error logic Signed-off-by: renoseven --- diff --git a/0006-syscared-optimize-transaction-creation-logic.patch b/0006-syscared-optimize-transaction-creation-logic.patch index e665a26..b43053a 100644 --- a/0006-syscared-optimize-transaction-creation-logic.patch +++ b/0006-syscared-optimize-transaction-creation-logic.patch @@ -1,7 +1,7 @@ From 211e4549324a9209dc982b7426af8b832410b619 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 12 Apr 2024 11:40:25 +0800 -Subject: [PATCH 06/20] syscared: optimize transaction creation logic +Subject: [PATCH] syscared: optimize transaction creation logic Signed-off-by: renoseven --- diff --git a/0007-upatch-manage-optimize-output.patch b/0007-upatch-manage-optimize-output.patch index f472d10..a97c047 100644 --- a/0007-upatch-manage-optimize-output.patch +++ b/0007-upatch-manage-optimize-output.patch @@ -1,7 +1,7 @@ From a32e9f39965579064dbd504246f13c6431ffed33 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 12 Apr 2024 11:50:59 +0800 -Subject: [PATCH 07/20] upatch-manage: optimize output +Subject: [PATCH] upatch-manage: optimize output Signed-off-by: renoseven --- diff --git a/0008-common-impl-CStr-from_bytes_with_next_nul.patch b/0008-common-impl-CStr-from_bytes_with_next_nul.patch index a192988..9322556 100644 --- a/0008-common-impl-CStr-from_bytes_with_next_nul.patch +++ b/0008-common-impl-CStr-from_bytes_with_next_nul.patch @@ -1,7 +1,7 @@ From cc090b31139bb9aa0158e50a8a620fc41b23231c Mon Sep 17 00:00:00 2001 From: renoseven Date: Tue, 16 Apr 2024 12:44:11 +0800 -Subject: [PATCH 08/20] common: impl CStr::from_bytes_with_next_nul() +Subject: [PATCH] common: impl CStr::from_bytes_with_next_nul() Signed-off-by: renoseven --- diff --git a/0009-syscared-improve-patch-management.patch b/0009-syscared-improve-patch-management.patch index d2656cf..3b49b35 100644 --- a/0009-syscared-improve-patch-management.patch +++ b/0009-syscared-improve-patch-management.patch @@ -1,7 +1,7 @@ From 354e0888188d4cabd9fff9912fa0935e4e1b4b52 Mon Sep 17 00:00:00 2001 From: renoseven Date: Tue, 16 Apr 2024 14:20:27 +0800 -Subject: [PATCH 09/20] syscared: improve patch management +Subject: [PATCH] syscared: improve patch management Signed-off-by: renoseven --- diff --git a/0010-syscared-stop-activating-ignored-process-on-new-proc.patch b/0010-syscared-stop-activating-ignored-process-on-new-proc.patch index eb956a9..4c41fc0 100644 --- a/0010-syscared-stop-activating-ignored-process-on-new-proc.patch +++ b/0010-syscared-stop-activating-ignored-process-on-new-proc.patch @@ -1,8 +1,8 @@ From a83410a74713c4f191aeb31bc9ea87b9e9f4bcc6 Mon Sep 17 00:00:00 2001 From: renoseven Date: Wed, 17 Apr 2024 19:14:19 +0800 -Subject: [PATCH 10/20] syscared: stop activating ignored process on new - process start +Subject: [PATCH] syscared: stop activating ignored process on new process + start Signed-off-by: renoseven --- diff --git a/0011-syscared-adapt-upatch-manage-exit-code-change.patch b/0011-syscared-adapt-upatch-manage-exit-code-change.patch index 5eaacbd..d3cb308 100644 --- a/0011-syscared-adapt-upatch-manage-exit-code-change.patch +++ b/0011-syscared-adapt-upatch-manage-exit-code-change.patch @@ -1,7 +1,7 @@ From 4ad0b0369cd039b64635d2c405fa244b6c6afb59 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 19 Apr 2024 12:02:23 +0800 -Subject: [PATCH 11/20] syscared: adapt upatch-manage exit code change +Subject: [PATCH] syscared: adapt upatch-manage exit code change 1. upatch driver treats EEXIST as an error diff --git a/0012-upatch-manage-change-exit-code.patch b/0012-upatch-manage-change-exit-code.patch index ea511b3..ef8f232 100644 --- a/0012-upatch-manage-change-exit-code.patch +++ b/0012-upatch-manage-change-exit-code.patch @@ -1,7 +1,7 @@ From e04ce4a7539a469091fef8c1566a85fe6050f728 Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 19 Apr 2024 12:01:38 +0800 -Subject: [PATCH 12/20] upatch-manage: change exit code +Subject: [PATCH] upatch-manage: change exit code 1. return more specific exit code 2. change exit code from EEXIST to 0 when patching existing patch (uuid) diff --git a/0013-upatch-manage-change-the-way-to-calculate-frozen-tim.patch b/0013-upatch-manage-change-the-way-to-calculate-frozen-tim.patch index 471cb6e..06ac67c 100644 --- a/0013-upatch-manage-change-the-way-to-calculate-frozen-tim.patch +++ b/0013-upatch-manage-change-the-way-to-calculate-frozen-tim.patch @@ -1,7 +1,7 @@ From ff07e664cb475fa74b4f6531d8e709a5dd9b55dd Mon Sep 17 00:00:00 2001 From: renoseven Date: Fri, 19 Apr 2024 14:19:27 +0800 -Subject: [PATCH 13/20] upatch-manage: change the way to calculate frozen time +Subject: [PATCH] upatch-manage: change the way to calculate frozen time Signed-off-by: renoseven --- diff --git a/0014-abi-change-uuid-string-to-uuid-bytes.patch b/0014-abi-change-uuid-string-to-uuid-bytes.patch index 44273dd..ac50b78 100644 --- a/0014-abi-change-uuid-string-to-uuid-bytes.patch +++ b/0014-abi-change-uuid-string-to-uuid-bytes.patch @@ -1,7 +1,7 @@ From c2fc4243ed918717bbcaa4a0c1b400051c7eded7 Mon Sep 17 00:00:00 2001 From: ningyu Date: Tue, 9 Apr 2024 09:21:35 +0000 -Subject: [PATCH 14/20] abi: change uuid string to uuid bytes +Subject: [PATCH] abi: change uuid string to uuid bytes Signed-off-by: ningyu --- diff --git a/0015-upatch-build-fix-file-detection-cause-build-failure-.patch b/0015-upatch-build-fix-file-detection-cause-build-failure-.patch index 646d9b7..5985b77 100644 --- a/0015-upatch-build-fix-file-detection-cause-build-failure-.patch +++ b/0015-upatch-build-fix-file-detection-cause-build-failure-.patch @@ -1,8 +1,7 @@ From 8deffbf247f51a8601e81bd65e448d9f228e98a8 Mon Sep 17 00:00:00 2001 From: renoseven Date: Thu, 9 May 2024 18:49:29 +0800 -Subject: [PATCH 15/20] upatch-build: fix 'file detection cause build failure' - issue +Subject: [PATCH] upatch-build: fix 'file detection cause build failure' issue File relation detection does not work as we expected sometimes. We changed the way to parse file relations from parsing dwarf info diff --git a/0016-upatch-diff-optimize-log-output.patch b/0016-upatch-diff-optimize-log-output.patch index 2504736..ce07bbe 100644 --- a/0016-upatch-diff-optimize-log-output.patch +++ b/0016-upatch-diff-optimize-log-output.patch @@ -1,7 +1,7 @@ From a7140a02d69b50d57403f2c769767e5365a6aa34 Mon Sep 17 00:00:00 2001 From: renoseven Date: Sat, 11 May 2024 08:26:33 +0800 -Subject: [PATCH 16/20] upatch-diff: optimize log output +Subject: [PATCH] upatch-diff: optimize log output Signed-off-by: renoseven --- diff --git a/0017-security-change-directory-permission.patch b/0017-security-change-directory-permission.patch index db9e8f0..87220fb 100644 --- a/0017-security-change-directory-permission.patch +++ b/0017-security-change-directory-permission.patch @@ -1,7 +1,7 @@ From b43d59716bb5ae6811c3f4fcab33ca9a6704b175 Mon Sep 17 00:00:00 2001 From: renoseven Date: Sat, 11 May 2024 08:28:48 +0800 -Subject: [PATCH 17/20] security: change directory permission +Subject: [PATCH] security: change directory permission 1. config_dir /etc/syscare drwx------. 2. data_dir /usr/lib/syscare drwx------. diff --git a/0018-security-change-daemon-socket-permission.patch b/0018-security-change-daemon-socket-permission.patch index 2f2051d..0fb1b9e 100644 --- a/0018-security-change-daemon-socket-permission.patch +++ b/0018-security-change-daemon-socket-permission.patch @@ -1,7 +1,7 @@ From bbbcb0c08f4a6a63230288485d88492465e2a593 Mon Sep 17 00:00:00 2001 From: renoseven Date: Sat, 11 May 2024 10:21:58 +0800 -Subject: [PATCH 18/20] security: change daemon socket permission +Subject: [PATCH] security: change daemon socket permission 1. add socket uid & gid to config file default uid: 0 diff --git a/0019-upatch-manage-Fixed-the-core-dump-issue-after-applyi.patch b/0019-upatch-manage-Fixed-the-core-dump-issue-after-applyi.patch index 7d9b189..079079a 100644 --- a/0019-upatch-manage-Fixed-the-core-dump-issue-after-applyi.patch +++ b/0019-upatch-manage-Fixed-the-core-dump-issue-after-applyi.patch @@ -1,8 +1,8 @@ From b9ae8a1ea14d46b3f4ba887fb10f9898c6f5cc53 Mon Sep 17 00:00:00 2001 From: ningyu Date: Sat, 11 May 2024 08:06:58 +0000 -Subject: [PATCH 19/20] upatch-manage: Fixed the core dump issue after applying - hot patches to nginx on x86_64 architecture. +Subject: [PATCH] upatch-manage: Fixed the core dump issue after applying hot + patches to nginx on x86_64 architecture. For non-dynamic library elf, do not place the global variables in the GOT table --- diff --git a/0020-upatch-diff-fix-lookup_relf-failed-issue.patch b/0020-upatch-diff-fix-lookup_relf-failed-issue.patch index 183c9a2..9acfad8 100644 --- a/0020-upatch-diff-fix-lookup_relf-failed-issue.patch +++ b/0020-upatch-diff-fix-lookup_relf-failed-issue.patch @@ -1,7 +1,7 @@ From fac8aa17d540e54fa0443015089cdc72c5da72e3 Mon Sep 17 00:00:00 2001 From: renoseven Date: Sat, 11 May 2024 17:31:46 +0800 -Subject: [PATCH 20/20] upatch-diff: fix 'lookup_relf failed' issue +Subject: [PATCH] upatch-diff: fix 'lookup_relf failed' issue Signed-off-by: renoseven --- diff --git a/0021-upatch-diff-only-check-changed-file-symbols.patch b/0021-upatch-diff-only-check-changed-file-symbols.patch index b13eeab..3f52067 100644 --- a/0021-upatch-diff-only-check-changed-file-symbols.patch +++ b/0021-upatch-diff-only-check-changed-file-symbols.patch @@ -1,7 +1,7 @@ From 2d711186e1c134b069102e72d6d451942c931eb5 Mon Sep 17 00:00:00 2001 From: renoseven Date: Mon, 13 May 2024 21:27:13 +0800 -Subject: [PATCH 21/22] upatch-diff: only check changed file symbols +Subject: [PATCH] upatch-diff: only check changed file symbols 1. sync compare results (SAME/NEW/CHANGED) to correlated objects 2. mark file changes by looking up symbol changes @@ -161,5 +161,5 @@ index 3bb35e7..676880f 100644 return (result->symbol != NULL); -- -2.41.0 +2.34.1 diff --git a/0022-upatch-diff-remove-rela-check-while-build-rebuilding.patch b/0022-upatch-diff-remove-rela-check-while-build-rebuilding.patch index ce7275a..f72416a 100644 --- a/0022-upatch-diff-remove-rela-check-while-build-rebuilding.patch +++ b/0022-upatch-diff-remove-rela-check-while-build-rebuilding.patch @@ -1,7 +1,7 @@ From 06ef9f212e17cdaa93dc5255d2c881c0b52d603f Mon Sep 17 00:00:00 2001 From: renoseven Date: Tue, 14 May 2024 14:10:05 +0800 -Subject: [PATCH 22/22] upatch-diff: remove rela check while build rebuilding +Subject: [PATCH] upatch-diff: remove rela check while build rebuilding .eh_frame Signed-off-by: renoseven @@ -23,5 +23,5 @@ index 6b5fc53..f9c5327 100644 /* -- -2.41.0 +2.34.1 diff --git a/0023-syscared-fix-apply-kernel-module-patch-failure-issue.patch b/0023-syscared-fix-apply-kernel-module-patch-failure-issue.patch index 669efa9..f5a392c 100644 --- a/0023-syscared-fix-apply-kernel-module-patch-failure-issue.patch +++ b/0023-syscared-fix-apply-kernel-module-patch-failure-issue.patch @@ -23,5 +23,5 @@ index 307efb5..970da92 100644 current_kernel == patch_target, "Kpatch: Patch is incompatible", -- -2.41.0 +2.34.1 diff --git a/0024-syscare-build-fix-build-oot-module-failure-issue.patch b/0024-syscare-build-fix-build-oot-module-failure-issue.patch index 2cce7ac..f954d7c 100644 --- a/0024-syscare-build-fix-build-oot-module-failure-issue.patch +++ b/0024-syscare-build-fix-build-oot-module-failure-issue.patch @@ -36,5 +36,5 @@ index ba49661..bcae962 100644 cmd_args.args(kbuild_params.patch_files.iter().map(|patch| &patch.path)); -- -2.41.0 +2.34.1 diff --git a/0025-all-finding-executable-from-environment-variables.patch b/0025-all-finding-executable-from-environment-variables.patch new file mode 100644 index 0000000..17b2c81 --- /dev/null +++ b/0025-all-finding-executable-from-environment-variables.patch @@ -0,0 +1,241 @@ +From 42d7bdb932dfb5bb511ab2698c4fe4f3fc4be0be Mon Sep 17 00:00:00 2001 +From: renoseven +Date: Wed, 29 May 2024 22:06:09 +0800 +Subject: [PATCH] all: finding executable from environment variables + +Signed-off-by: renoseven +--- + syscare-build/src/main.rs | 10 ++++++++-- + syscare-build/src/patch/user_patch/upatch_builder.rs | 2 +- + syscare/src/executor/build.rs | 7 +++---- + syscare/src/main.rs | 10 ++++++++-- + syscared/src/main.rs | 10 ++++++++-- + syscared/src/patch/driver/upatch/sys.rs | 2 +- + upatch-build/src/main.rs | 9 ++++++++- + 7 files changed, 37 insertions(+), 13 deletions(-) + +diff --git a/syscare-build/src/main.rs b/syscare-build/src/main.rs +index 8928218..1faa803 100644 +--- a/syscare-build/src/main.rs ++++ b/syscare-build/src/main.rs +@@ -12,7 +12,7 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{process, sync::Arc}; ++use std::{env, process, sync::Arc}; + + use anyhow::{bail, ensure, Context, Result}; + use flexi_logger::{ +@@ -22,7 +22,7 @@ use lazy_static::lazy_static; + use log::{error, info, LevelFilter, Record}; + + use syscare_abi::{PackageInfo, PackageType, PatchInfo, PatchType}; +-use syscare_common::{fs, os}; ++use syscare_common::{concat_os, fs, os}; + + mod args; + mod build_params; +@@ -44,6 +44,9 @@ const CLI_VERSION: &str = env!("CARGO_PKG_VERSION"); + const CLI_ABOUT: &str = env!("CARGO_PKG_DESCRIPTION"); + const CLI_UMASK: u32 = 0o022; + ++const PATH_ENV_NAME: &str = "PATH"; ++const PATH_ENV_VALUE: &str = "/usr/libexec/syscare"; ++ + const LOG_FILE_NAME: &str = "build"; + const KERNEL_PKG_NAME: &str = "kernel"; + +@@ -70,6 +73,9 @@ impl SyscareBuild { + fn new() -> Result { + // Initialize arguments & prepare environments + os::umask::set_umask(CLI_UMASK); ++ if let Some(path_env) = env::var_os(PATH_ENV_NAME) { ++ env::set_var(PATH_ENV_NAME, concat_os!(PATH_ENV_VALUE, ":", path_env)); ++ } + + let args = Arguments::new()?; + let build_root = BuildRoot::new(&args.build_root)?; +diff --git a/syscare-build/src/patch/user_patch/upatch_builder.rs b/syscare-build/src/patch/user_patch/upatch_builder.rs +index 1e0e6b6..255c2d3 100644 +--- a/syscare-build/src/patch/user_patch/upatch_builder.rs ++++ b/syscare-build/src/patch/user_patch/upatch_builder.rs +@@ -34,7 +34,7 @@ use crate::{build_params::BuildParameters, package::PackageImpl, patch::PatchBui + + use super::{elf_relation::ElfRelation, DEBUGINFO_FILE_EXT}; + +-const UPATCH_BUILD_BIN: &str = "/usr/libexec/syscare/upatch-build"; ++const UPATCH_BUILD_BIN: &str = "upatch-build"; + const RPMBUILD_BIN: &str = "rpmbuild"; + + struct UBuildParameters { +diff --git a/syscare/src/executor/build.rs b/syscare/src/executor/build.rs +index f9027c7..6d3866f 100644 +--- a/syscare/src/executor/build.rs ++++ b/syscare/src/executor/build.rs +@@ -19,22 +19,21 @@ use anyhow::{bail, Context, Result}; + use super::CommandExecutor; + use crate::args::SubCommand; + +-const SYSCARE_BUILD_PATH: &str = "/usr/libexec/syscare/syscare-build"; ++const SYSCARE_BUILD_BIN: &str = "syscare-build"; + + pub struct BuildCommandExecutor; + + impl CommandExecutor for BuildCommandExecutor { + fn invoke(&self, command: &SubCommand) -> Result> { + if let SubCommand::Build { args } = command { +- let e = Command::new(SYSCARE_BUILD_PATH).args(args).exec(); ++ let e = Command::new(SYSCARE_BUILD_BIN).args(args).exec(); + + match e.kind() { + std::io::ErrorKind::NotFound => { + bail!("Package syscare-build is not installed"); + } + _ => { +- return Err(e) +- .with_context(|| format!("Failed to start {}", SYSCARE_BUILD_PATH)) ++ return Err(e).with_context(|| format!("Failed to start {}", SYSCARE_BUILD_BIN)) + } + } + } +diff --git a/syscare/src/main.rs b/syscare/src/main.rs +index c709f6a..dea5717 100644 +--- a/syscare/src/main.rs ++++ b/syscare/src/main.rs +@@ -12,7 +12,7 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{process, rc::Rc}; ++use std::{env, process, rc::Rc}; + + use anyhow::{Context, Result}; + use flexi_logger::{DeferredNow, LogSpecification, Logger, LoggerHandle, WriteMode}; +@@ -25,13 +25,16 @@ mod rpc; + use args::Arguments; + use executor::{build::BuildCommandExecutor, patch::PatchCommandExecutor, CommandExecutor}; + use rpc::{RpcProxy, RpcRemote}; +-use syscare_common::os; ++use syscare_common::{concat_os, os}; + + pub const CLI_NAME: &str = env!("CARGO_PKG_NAME"); + pub const CLI_VERSION: &str = env!("CARGO_PKG_VERSION"); + pub const CLI_ABOUT: &str = env!("CARGO_PKG_DESCRIPTION"); + const CLI_UMASK: u32 = 0o077; + ++const PATH_ENV_NAME: &str = "PATH"; ++const PATH_ENV_VALUE: &str = "/usr/libexec/syscare"; ++ + const SOCKET_FILE_NAME: &str = "syscared.sock"; + const PATCH_OP_LOCK_NAME: &str = "patch_op.lock"; + +@@ -52,6 +55,9 @@ impl SyscareCLI { + fn new() -> Result { + // Initialize arguments & prepare environments + os::umask::set_umask(CLI_UMASK); ++ if let Some(path_env) = env::var_os(PATH_ENV_NAME) { ++ env::set_var(PATH_ENV_NAME, concat_os!(PATH_ENV_VALUE, ":", path_env)); ++ } + + let args = Arguments::new()?; + +diff --git a/syscared/src/main.rs b/syscared/src/main.rs +index b840abf..5c60ecf 100644 +--- a/syscared/src/main.rs ++++ b/syscared/src/main.rs +@@ -12,7 +12,7 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{fs::Permissions, os::unix::fs::PermissionsExt, panic, process, sync::Arc}; ++use std::{env, fs::Permissions, os::unix::fs::PermissionsExt, panic, process, sync::Arc}; + + use anyhow::{ensure, Context, Result}; + use daemonize::Daemonize; +@@ -28,7 +28,7 @@ use parking_lot::RwLock; + use patch::manager::PatchManager; + use signal_hook::{consts::TERM_SIGNALS, iterator::Signals, low_level::signal_name}; + +-use syscare_common::{fs, os}; ++use syscare_common::{concat_os, fs, os}; + + mod args; + mod config; +@@ -49,6 +49,9 @@ const DAEMON_VERSION: &str = env!("CARGO_PKG_VERSION"); + const DAEMON_ABOUT: &str = env!("CARGO_PKG_DESCRIPTION"); + const DAEMON_UMASK: u32 = 0o077; + ++const PATH_ENV_NAME: &str = "PATH"; ++const PATH_ENV_VALUE: &str = "/usr/libexec/syscare"; ++ + const CONFIG_FILE_NAME: &str = "syscared.yaml"; + const PID_FILE_NAME: &str = "syscared.pid"; + const SOCKET_FILE_NAME: &str = "syscared.sock"; +@@ -107,6 +110,9 @@ impl Daemon { + + // Initialize arguments & prepare environments + os::umask::set_umask(DAEMON_UMASK); ++ if let Some(path_env) = env::var_os(PATH_ENV_NAME) { ++ env::set_var(PATH_ENV_NAME, concat_os!(PATH_ENV_VALUE, ":", path_env)); ++ } + + let args = Arguments::new()?; + fs::create_dir_all(&args.config_dir)?; +diff --git a/syscared/src/patch/driver/upatch/sys.rs b/syscared/src/patch/driver/upatch/sys.rs +index a388bc6..1990289 100644 +--- a/syscared/src/patch/driver/upatch/sys.rs ++++ b/syscared/src/patch/driver/upatch/sys.rs +@@ -6,7 +6,7 @@ use uuid::Uuid; + + use syscare_common::process::Command; + +-const UPATCH_MANAGE_BIN: &str = "/usr/libexec/syscare/upatch-manage"; ++const UPATCH_MANAGE_BIN: &str = "upatch-manage"; + + pub fn active_patch(uuid: &Uuid, pid: i32, target_elf: &Path, patch_file: &Path) -> Result<()> { + let exit_code = Command::new(UPATCH_MANAGE_BIN) +diff --git a/upatch-build/src/main.rs b/upatch-build/src/main.rs +index b5c14a8..473b0a7 100644 +--- a/upatch-build/src/main.rs ++++ b/upatch-build/src/main.rs +@@ -13,6 +13,7 @@ + */ + + use std::{ ++ env, + ffi::OsStr, + fs::Permissions, + os::unix::fs::PermissionsExt, +@@ -54,6 +55,9 @@ const CLI_VERSION: &str = env!("CARGO_PKG_VERSION"); + const CLI_ABOUT: &str = env!("CARGO_PKG_DESCRIPTION"); + const CLI_UMASK: u32 = 0o022; + ++const PATH_ENV_NAME: &str = "PATH"; ++const PATH_ENV_VALUE: &str = "/usr/libexec/syscare"; ++ + const LOG_FILE_NAME: &str = "build"; + + struct BuildInfo { +@@ -83,6 +87,9 @@ impl UpatchBuild { + fn new() -> Result { + // Initialize arguments & prepare environments + os::umask::set_umask(CLI_UMASK); ++ if let Some(path_env) = env::var_os(PATH_ENV_NAME) { ++ env::set_var(PATH_ENV_NAME, concat_os!(PATH_ENV_VALUE, ":", path_env)); ++ } + + let args = Arguments::new()?; + let build_root = BuildRoot::new(&args.build_root)?; +@@ -196,7 +203,7 @@ impl UpatchBuild { + output_dir: &Path, + verbose: bool, + ) -> Result<()> { +- const UPATCH_DIFF_BIN: &str = "/usr/libexec/syscare/upatch-diff"; ++ const UPATCH_DIFF_BIN: &str = "upatch-diff"; + + let ouput_name = original_object.file_name().with_context(|| { + format!( +-- +2.34.1 + diff --git a/0026-all-remove-redundant-code.patch b/0026-all-remove-redundant-code.patch new file mode 100644 index 0000000..bface9b --- /dev/null +++ b/0026-all-remove-redundant-code.patch @@ -0,0 +1,901 @@ +From abdafc1728b233b93c42b76034e19286e3fcbda7 Mon Sep 17 00:00:00 2001 +From: renoseven +Date: Tue, 21 May 2024 15:01:48 +0800 +Subject: [PATCH] all: remove redundant code + +Signed-off-by: renoseven +--- + syscare-build/src/build_root/mod.rs | 20 +- + syscare-build/src/build_root/package_root.rs | 6 - + syscare-build/src/build_root/patch_root.rs | 6 - + syscare-build/src/package/dependency.rs | 10 - + syscare-build/src/package/mod.rs | 1 - + syscare-build/src/package/rpm/mod.rs | 4 - + syscare-common/src/os/disk.rs | 64 ---- + syscare-common/src/os/grub.rs | 312 ------------------ + syscare-common/src/os/kernel.rs | 43 +-- + syscare-common/src/os/mod.rs | 2 - + syscare-common/src/util/digest.rs | 7 - + syscared/src/fast_reboot/manager.rs | 123 ------- + syscared/src/fast_reboot/mod.rs | 17 - + syscared/src/main.rs | 7 +- + syscared/src/rpc/skeleton/fast_reboot.rs | 21 -- + syscared/src/rpc/skeleton/mod.rs | 2 - + syscared/src/rpc/skeleton_impl/fast_reboot.rs | 42 --- + syscared/src/rpc/skeleton_impl/mod.rs | 2 - + 18 files changed, 3 insertions(+), 686 deletions(-) + delete mode 100644 syscare-build/src/package/dependency.rs + delete mode 100644 syscare-common/src/os/disk.rs + delete mode 100644 syscare-common/src/os/grub.rs + delete mode 100644 syscared/src/fast_reboot/manager.rs + delete mode 100644 syscared/src/fast_reboot/mod.rs + delete mode 100644 syscared/src/rpc/skeleton/fast_reboot.rs + delete mode 100644 syscared/src/rpc/skeleton_impl/fast_reboot.rs + +diff --git a/syscare-build/src/build_root/mod.rs b/syscare-build/src/build_root/mod.rs +index 81de6b2..6a12788 100644 +--- a/syscare-build/src/build_root/mod.rs ++++ b/syscare-build/src/build_root/mod.rs +@@ -12,11 +12,7 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{ +- ffi::OsStr, +- ops::Deref, +- path::{Path, PathBuf}, +-}; ++use std::path::{Path, PathBuf}; + + use anyhow::Result; + use syscare_common::fs; +@@ -61,17 +57,3 @@ impl BuildRoot { + Ok(()) + } + } +- +-impl Deref for BuildRoot { +- type Target = Path; +- +- fn deref(&self) -> &Self::Target { +- &self.path +- } +-} +- +-impl AsRef for BuildRoot { +- fn as_ref(&self) -> &OsStr { +- self.as_os_str() +- } +-} +diff --git a/syscare-build/src/build_root/package_root.rs b/syscare-build/src/build_root/package_root.rs +index abb7a86..724a42b 100644 +--- a/syscare-build/src/build_root/package_root.rs ++++ b/syscare-build/src/build_root/package_root.rs +@@ -50,9 +50,3 @@ impl PackageRoot { + }) + } + } +- +-impl AsRef for PackageRoot { +- fn as_ref(&self) -> &Path { +- &self.path +- } +-} +diff --git a/syscare-build/src/build_root/patch_root.rs b/syscare-build/src/build_root/patch_root.rs +index b780e32..af8ec6b 100644 +--- a/syscare-build/src/build_root/patch_root.rs ++++ b/syscare-build/src/build_root/patch_root.rs +@@ -44,9 +44,3 @@ impl PatchRoot { + }) + } + } +- +-impl AsRef for PatchRoot { +- fn as_ref(&self) -> &Path { +- &self.path +- } +-} +diff --git a/syscare-build/src/package/dependency.rs b/syscare-build/src/package/dependency.rs +deleted file mode 100644 +index 37bdf92..0000000 +--- a/syscare-build/src/package/dependency.rs ++++ /dev/null +@@ -1,10 +0,0 @@ +-pub struct PackageDependency { +- requires: HashSet, +- conflicts: HashSet, +- suggests: HashSet, +- recommends: HashSet, +-} +- +-impl PackageDependency { +- +-} +\ No newline at end of file +diff --git a/syscare-build/src/package/mod.rs b/syscare-build/src/package/mod.rs +index 9ba29a1..72b555a 100644 +--- a/syscare-build/src/package/mod.rs ++++ b/syscare-build/src/package/mod.rs +@@ -33,7 +33,6 @@ pub use spec_writer::*; + pub use tar::*; + + trait Package { +- fn extension(&self) -> &'static str; + fn parse_package_info(&self, pkg_path: &Path) -> Result; + fn query_package_files(&self, pkg_path: &Path) -> Result>; + fn extract_package(&self, pkg_path: &Path, output_dir: &Path) -> Result<()>; +diff --git a/syscare-build/src/package/rpm/mod.rs b/syscare-build/src/package/rpm/mod.rs +index 5b4bf07..0e9f77c 100644 +--- a/syscare-build/src/package/rpm/mod.rs ++++ b/syscare-build/src/package/rpm/mod.rs +@@ -60,10 +60,6 @@ impl RpmPackage { + } + + impl Package for RpmPackage { +- fn extension(&self) -> &'static str { +- PKG_FILE_EXT +- } +- + fn parse_package_info(&self, pkg_path: &Path) -> Result { + let query_result = Self::query_package_info( + pkg_path, +diff --git a/syscare-common/src/os/disk.rs b/syscare-common/src/os/disk.rs +deleted file mode 100644 +index 7ace804..0000000 +--- a/syscare-common/src/os/disk.rs ++++ /dev/null +@@ -1,64 +0,0 @@ +-// SPDX-License-Identifier: Mulan PSL v2 +-/* +- * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * syscare-common is licensed under Mulan PSL v2. +- * You can use this software according to the terms and conditions of the Mulan PSL v2. +- * You may obtain a copy of Mulan PSL v2 at: +- * http://license.coscl.org.cn/MulanPSL2 +- * +- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +- * See the Mulan PSL v2 for more details. +- */ +- +-use std::ffi::OsStr; +-use std::path::{Path, PathBuf}; +- +-use crate::fs; +- +-#[inline(always)] +-fn find_disk, S: AsRef>(directory: P, name: S) -> std::io::Result { +- #[inline(always)] +- fn __find_disk(directory: &Path, name: &OsStr) -> std::io::Result { +- let dev = fs::find_symlink( +- directory, +- name, +- fs::FindOptions { +- fuzz: false, +- recursive: false, +- }, +- )?; +- fs::canonicalize(dev) +- } +- +- __find_disk(directory.as_ref(), name.as_ref()).map_err(|_| { +- std::io::Error::new( +- std::io::ErrorKind::NotFound, +- format!( +- "Cannot find block device by label \"{}\"", +- name.as_ref().to_string_lossy() +- ), +- ) +- }) +-} +- +-pub fn find_by_id>(name: S) -> std::io::Result { +- find_disk("/dev/disk/by-id", name) +-} +- +-pub fn find_by_label>(name: S) -> std::io::Result { +- find_disk("/dev/disk/by-label", name) +-} +- +-pub fn find_by_uuid>(name: S) -> std::io::Result { +- find_disk("/dev/disk/by-uuid", name) +-} +- +-pub fn find_by_partuuid>(name: S) -> std::io::Result { +- find_disk("/dev/disk/by-partuuid", name) +-} +- +-pub fn find_by_path>(name: S) -> std::io::Result { +- find_disk("/dev/disk/by-path", name) +-} +diff --git a/syscare-common/src/os/grub.rs b/syscare-common/src/os/grub.rs +deleted file mode 100644 +index 54299d8..0000000 +--- a/syscare-common/src/os/grub.rs ++++ /dev/null +@@ -1,312 +0,0 @@ +-// SPDX-License-Identifier: Mulan PSL v2 +-/* +- * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * syscare-common is licensed under Mulan PSL v2. +- * You can use this software according to the terms and conditions of the Mulan PSL v2. +- * You may obtain a copy of Mulan PSL v2 at: +- * http://license.coscl.org.cn/MulanPSL2 +- * +- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +- * See the Mulan PSL v2 for more details. +- */ +- +-use std::collections::HashMap; +-use std::ffi::{OsStr, OsString}; +-use std::io::{BufRead, BufReader}; +-use std::os::unix::prelude::OsStrExt as StdOsStrExt; +-use std::path::{Path, PathBuf}; +- +-use lazy_static::lazy_static; +-use log::debug; +-use regex::bytes::Regex; +- +-use super::{disk, proc_mounts}; +-use crate::{ +- ffi::OsStrExt, +- fs, +- io::{BufReadOsLines, OsLines}, +-}; +- +-#[derive(Debug, Clone, Copy)] +-enum BootType { +- Csm, +- Uefi, +-} +- +-#[derive(Debug)] +-pub struct GrubMenuEntry { +- name: OsString, +- root: PathBuf, +- kernel: PathBuf, +- initrd: PathBuf, +-} +- +-impl GrubMenuEntry { +- pub fn get_name(&self) -> &OsStr { +- &self.name +- } +- +- pub fn get_root(&self) -> &Path { +- &self.root +- } +- +- pub fn get_kernel(&self) -> PathBuf { +- // Path is stripped by regular expression, thus, it would always start with '/' +- self.root.join(self.kernel.strip_prefix("/").unwrap()) +- } +- +- pub fn get_initrd(&self) -> PathBuf { +- // Path is stripped by regular expression, thus, it would always start with '/' +- self.root.join(self.initrd.strip_prefix("/").unwrap()) +- } +-} +- +-struct GrubConfigParser { +- lines: OsLines, +- is_matching: bool, +- entry_name: Option, +- entry_root: Option, +- entry_kernel: Option, +- entry_initrd: Option, +-} +- +-impl GrubConfigParser { +- pub fn new(buf: R) -> Self { +- Self { +- lines: buf.os_lines(), +- is_matching: false, +- entry_name: None, +- entry_root: None, +- entry_kernel: None, +- entry_initrd: None, +- } +- } +- +- #[inline(always)] +- fn parse_name(str: &OsStr) -> Option { +- lazy_static! { +- static ref RE: Regex = Regex::new(r"'([^']*)'").unwrap(); +- } +- RE.captures(str.as_bytes()) +- .and_then(|captures| captures.get(1)) +- .map(|matched| OsStr::from_bytes(matched.as_bytes()).to_os_string()) +- } +- +- #[inline(always)] +- fn parse_uuid(str: &OsStr) -> Option { +- str.split_whitespace() +- .filter_map(|str| { +- let arg = str.trim(); +- if arg != OsStr::new("search") && !arg.starts_with("--") { +- return Some(arg.to_os_string()); +- } +- None +- }) +- .next() +- } +- +- #[inline(always)] +- fn parse_path(str: &OsStr) -> Option { +- lazy_static! { +- static ref RE: Regex = Regex::new(r"/\.?\w+([\w\-\.])*").unwrap(); +- } +- RE.find(str.as_bytes()) +- .map(|matched| PathBuf::from(OsStr::from_bytes(matched.as_bytes()))) +- } +- +- #[inline(always)] +- fn parse_mount_point(str: &OsStr) -> Option { +- let find_dev = Self::parse_uuid(str).and_then(|uuid| disk::find_by_uuid(uuid).ok()); +- if let (Some(dev_name), Ok(mounts)) = (find_dev, proc_mounts::Mounts::new()) { +- for mount in mounts { +- if mount.mount_source == dev_name { +- return Some(mount.mount_point); +- } +- } +- } +- None +- } +-} +- +-impl Iterator for GrubConfigParser { +- type Item = GrubMenuEntry; +- +- fn next(&mut self) -> Option { +- for line in (&mut self.lines).flatten() { +- if line.starts_with("#") { +- continue; +- } +- +- let str = line.trim(); +- if str.is_empty() { +- continue; +- } +- +- if !self.is_matching { +- if str.starts_with("menuentry '") { +- self.entry_name = Self::parse_name(str); +- self.is_matching = true; +- } +- continue; +- } +- if str.starts_with("search") { +- self.entry_root = Self::parse_mount_point(str); +- } else if str.starts_with("linux") { +- self.entry_kernel = Self::parse_path(str); +- } else if str.starts_with("initrd") { +- self.entry_initrd = Self::parse_path(str); +- } else if str.starts_with("}") { +- let entry = match ( +- &self.entry_name, +- &self.entry_root, +- &self.entry_kernel, +- &self.entry_initrd, +- ) { +- (Some(name), Some(root), Some(kernel), Some(initrd)) => Some(GrubMenuEntry { +- name: name.to_os_string(), +- root: root.to_path_buf(), +- kernel: kernel.to_path_buf(), +- initrd: initrd.to_path_buf(), +- }), +- _ => None, +- }; +- self.is_matching = false; +- self.entry_name = None; +- self.entry_root = None; +- self.entry_kernel = None; +- self.entry_initrd = None; +- +- return entry; +- } +- } +- None +- } +-} +- +-struct GrubEnvParser { +- lines: OsLines, +-} +- +-impl GrubEnvParser { +- pub fn new(buf: R) -> Self { +- Self { +- lines: buf.os_lines(), +- } +- } +-} +- +-impl Iterator for GrubEnvParser { +- type Item = (OsString, OsString); +- +- fn next(&mut self) -> Option { +- for line in (&mut self.lines).flatten() { +- if line.starts_with("#") { +- continue; +- } +- +- let str = line.trim(); +- if str.is_empty() { +- continue; +- } +- +- let mut kv = line.split('='); +- if let (Some(key), Some(value)) = (kv.next(), kv.next()) { +- return Some((key.trim().to_os_string(), value.trim().to_os_string())); +- } +- } +- +- None +- } +-} +- +-fn get_boot_type() -> BootType { +- const UEFI_SYS_INTERFACE: &str = "/sys/firmware/efi"; +- +- match fs::metadata(UEFI_SYS_INTERFACE) { +- Ok(_) => BootType::Uefi, +- Err(_) => BootType::Csm, +- } +-} +- +-fn get_grub_path(boot_type: BootType) -> PathBuf { +- const CSM_GRUB_PATH: &str = "/boot/grub2"; +- const UEFI_GRUB_PATH: &str = "/boot/efi/EFI"; +- +- match boot_type { +- BootType::Csm => PathBuf::from(CSM_GRUB_PATH), +- BootType::Uefi => PathBuf::from(UEFI_GRUB_PATH), +- } +-} +- +-fn find_grub_config>(grub_root: P) -> std::io::Result { +- const GRUB_CFG_NAME: &str = "grub.cfg"; +- +- fs::find_file( +- grub_root, +- GRUB_CFG_NAME, +- fs::FindOptions { +- fuzz: false, +- recursive: true, +- }, +- ) +-} +- +-fn find_grub_env>(grub_root: P) -> std::io::Result { +- const GRUB_ENV_NAME: &str = "grubenv"; +- +- fs::find_file( +- grub_root, +- GRUB_ENV_NAME, +- fs::FindOptions { +- fuzz: false, +- recursive: true, +- }, +- ) +-} +- +-pub fn read_menu_entries>(grub_root: P) -> std::io::Result> { +- let grub_config = find_grub_config(grub_root)?; +- +- let result = GrubConfigParser::new(BufReader::new(fs::open_file(grub_config)?)).collect(); +- +- Ok(result) +-} +- +-pub fn read_grub_env>(grub_root: P) -> std::io::Result> { +- let grub_env = find_grub_env(grub_root).unwrap(); +- +- let result = GrubEnvParser::new(BufReader::new(fs::open_file(grub_env)?)).collect(); +- +- Ok(result) +-} +- +-pub fn get_boot_entry() -> std::io::Result { +- let boot_type = get_boot_type(); +- let grub_root = get_grub_path(boot_type); +- debug!("Boot type: {:?}", boot_type); +- +- let menu_entries = read_menu_entries(&grub_root)?; +- debug!("Boot entries: {:#?}", menu_entries); +- +- let grub_env = read_grub_env(&grub_root)?; +- let default_entry_name = grub_env.get(OsStr::new("saved_entry")).ok_or_else(|| { +- std::io::Error::new( +- std::io::ErrorKind::Other, +- "Cannot read grub default entry name", +- ) +- })?; +- debug!("Default entry: {:?}", default_entry_name); +- +- for entry in menu_entries { +- if entry.get_name() == default_entry_name { +- return Ok(entry); +- } +- } +- +- Err(std::io::Error::new( +- std::io::ErrorKind::Other, +- format!("Cannot find grub default entry {:?}", default_entry_name), +- )) +-} +diff --git a/syscare-common/src/os/kernel.rs b/syscare-common/src/os/kernel.rs +index b89850b..a29e663 100644 +--- a/syscare-common/src/os/kernel.rs ++++ b/syscare-common/src/os/kernel.rs +@@ -12,51 +12,10 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{ffi::OsStr, path::Path}; +- +-use anyhow::Result; +- +-const KEXEC_PATH: &str = "kexec"; +-const SYSTEMCTL_PATH: &str = "systemctl"; ++use std::ffi::OsStr; + + use super::platform; +-use crate::{concat_os, process::Command}; + + pub fn version() -> &'static OsStr { + platform::release() + } +- +-pub fn load(kernel: P, initramfs: Q) -> Result<()> +-where +- P: AsRef, +- Q: AsRef, +-{ +- Command::new(KEXEC_PATH) +- .arg("--load") +- .arg(kernel.as_ref()) +- .arg(concat_os!("--initrd=", initramfs.as_ref())) +- .arg("--reuse-cmdline") +- .run_with_output()? +- .exit_ok() +-} +- +-pub fn unload() -> Result<()> { +- Command::new(KEXEC_PATH) +- .arg("--unload") +- .run_with_output()? +- .exit_ok() +-} +- +-pub fn systemd_exec() -> Result<()> { +- Command::new(SYSTEMCTL_PATH) +- .arg("kexec") +- .run_with_output()? +- .exit_ok() +-} +- +-pub fn force_exec() -> Result<()> { +- Command::new(KEXEC_PATH) +- .arg("--exec") +- .run_with_output()? +- .exit_ok() +-} +diff --git a/syscare-common/src/os/mod.rs b/syscare-common/src/os/mod.rs +index 8e6d5c1..6a93a20 100644 +--- a/syscare-common/src/os/mod.rs ++++ b/syscare-common/src/os/mod.rs +@@ -13,8 +13,6 @@ + */ + + pub mod cpu; +-pub mod disk; +-pub mod grub; + pub mod kernel; + pub mod platform; + pub mod proc_maps; +diff --git a/syscare-common/src/util/digest.rs b/syscare-common/src/util/digest.rs +index bb879cb..086b636 100644 +--- a/syscare-common/src/util/digest.rs ++++ b/syscare-common/src/util/digest.rs +@@ -45,10 +45,3 @@ where + + Ok(format!("{:#x}", hasher.finalize())) + } +- +-pub fn dir>(directory: P) -> std::io::Result { +- file_list(fs::list_files( +- directory, +- fs::TraverseOptions { recursive: true }, +- )?) +-} +diff --git a/syscared/src/fast_reboot/manager.rs b/syscared/src/fast_reboot/manager.rs +deleted file mode 100644 +index 8a4a928..0000000 +--- a/syscared/src/fast_reboot/manager.rs ++++ /dev/null +@@ -1,123 +0,0 @@ +-// SPDX-License-Identifier: Mulan PSL v2 +-/* +- * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * syscared is licensed under Mulan PSL v2. +- * You can use this software according to the terms and conditions of the Mulan PSL v2. +- * You may obtain a copy of Mulan PSL v2 at: +- * http://license.coscl.org.cn/MulanPSL2 +- * +- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +- * See the Mulan PSL v2 for more details. +- */ +- +-use std::path::PathBuf; +- +-use anyhow::{Context, Result}; +-use lazy_static::lazy_static; +-use log::{error, info}; +- +-use syscare_common::{ +- fs, +- os::{grub, kernel}, +-}; +- +-lazy_static! { +- static ref BOOT_DIRECTORY: PathBuf = PathBuf::from("/boot"); +-} +- +-pub enum RebootOption { +- Normal, +- Forced, +-} +- +-struct LoadKernelOption { +- name: String, +- kernel: PathBuf, +- initramfs: PathBuf, +-} +- +-pub struct KExecManager; +- +-impl KExecManager { +- fn find_kernel(kernel_version: &str) -> Result { +- info!("Finding kernel {}...", kernel_version); +- let kernel_file_name = format!("vmlinuz-{}", kernel_version); +- let kernel_file = fs::find_file( +- BOOT_DIRECTORY.as_path(), +- kernel_file_name, +- fs::FindOptions { +- fuzz: false, +- recursive: false, +- }, +- ) +- .with_context(|| format!("Cannot find kernel {}", kernel_version))?; +- +- info!("Finding initramfs..."); +- let initramfs_file_name = format!("initramfs-{}.img", kernel_version); +- let initramfs_file = fs::find_file( +- BOOT_DIRECTORY.as_path(), +- initramfs_file_name, +- fs::FindOptions { +- fuzz: false, +- recursive: false, +- }, +- ) +- .with_context(|| format!("Cannot find kernel {} initramfs", kernel_version))?; +- +- Ok(LoadKernelOption { +- name: kernel_version.to_owned(), +- kernel: kernel_file, +- initramfs: initramfs_file, +- }) +- } +- +- fn find_kernel_by_grub() -> Result { +- info!("Parsing grub configuration..."); +- let entry = grub::get_boot_entry().context("Failed to read grub boot entry")?; +- let entry_name = entry +- .get_name() +- .to_str() +- .context("Failed to parse grub entry name")?; +- +- Ok(LoadKernelOption { +- name: entry_name.to_owned(), +- kernel: entry.get_kernel(), +- initramfs: entry.get_initrd(), +- }) +- } +- +- pub fn load_kernel(kernel_version: Option) -> Result<()> { +- let load_option = match kernel_version { +- Some(version) => Self::find_kernel(&version), +- None => Self::find_kernel_by_grub().or_else(|e| { +- error!("{:?}", e); +- let version: &str = kernel::version() +- .to_str() +- .context("Failed to parse current kernel version")?; +- +- Self::find_kernel(version) +- }), +- }?; +- +- kernel::unload().context("Failed to unload kernel")?; +- +- let name = load_option.name; +- let kernel = load_option.kernel; +- let initramfs = load_option.initramfs; +- info!("Loading {:?}", name); +- info!("Using kernel: {:?}", kernel); +- info!("Using initrd: {:?}", initramfs); +- +- kernel::load(&kernel, &initramfs).context("Failed to load kernel") +- } +- +- pub fn execute(option: RebootOption) -> Result<()> { +- match option { +- RebootOption::Normal => kernel::systemd_exec(), +- RebootOption::Forced => kernel::force_exec(), +- } +- .context("Failed to execute kernel") +- } +-} +diff --git a/syscared/src/fast_reboot/mod.rs b/syscared/src/fast_reboot/mod.rs +deleted file mode 100644 +index 8c40eb9..0000000 +--- a/syscared/src/fast_reboot/mod.rs ++++ /dev/null +@@ -1,17 +0,0 @@ +-// SPDX-License-Identifier: Mulan PSL v2 +-/* +- * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * syscared is licensed under Mulan PSL v2. +- * You can use this software according to the terms and conditions of the Mulan PSL v2. +- * You may obtain a copy of Mulan PSL v2 at: +- * http://license.coscl.org.cn/MulanPSL2 +- * +- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +- * See the Mulan PSL v2 for more details. +- */ +- +-mod manager; +- +-pub use manager::*; +diff --git a/syscared/src/main.rs b/syscared/src/main.rs +index 5c60ecf..f13a9f8 100644 +--- a/syscared/src/main.rs ++++ b/syscared/src/main.rs +@@ -32,17 +32,13 @@ use syscare_common::{concat_os, fs, os}; + + mod args; + mod config; +-mod fast_reboot; + mod patch; + mod rpc; + + use args::Arguments; + use config::Config; + use patch::monitor::PatchMonitor; +-use rpc::{ +- skeleton::{FastRebootSkeleton, PatchSkeleton}, +- skeleton_impl::{FastRebootSkeletonImpl, PatchSkeletonImpl}, +-}; ++use rpc::{skeleton::PatchSkeleton, skeleton_impl::PatchSkeletonImpl}; + + const DAEMON_NAME: &str = env!("CARGO_PKG_NAME"); + const DAEMON_VERSION: &str = env!("CARGO_PKG_VERSION"); +@@ -195,7 +191,6 @@ impl Daemon { + let mut io_handler = IoHandler::new(); + + io_handler.extend_with(PatchSkeletonImpl::new(patch_manager).to_delegate()); +- io_handler.extend_with(FastRebootSkeletonImpl.to_delegate()); + + Ok(io_handler) + } +diff --git a/syscared/src/rpc/skeleton/fast_reboot.rs b/syscared/src/rpc/skeleton/fast_reboot.rs +deleted file mode 100644 +index 1a7b496..0000000 +--- a/syscared/src/rpc/skeleton/fast_reboot.rs ++++ /dev/null +@@ -1,21 +0,0 @@ +-// SPDX-License-Identifier: Mulan PSL v2 +-/* +- * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * syscared is licensed under Mulan PSL v2. +- * You can use this software according to the terms and conditions of the Mulan PSL v2. +- * You may obtain a copy of Mulan PSL v2 at: +- * http://license.coscl.org.cn/MulanPSL2 +- * +- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +- * See the Mulan PSL v2 for more details. +- */ +- +-use super::function::{rpc, RpcResult}; +- +-#[rpc(server)] +-pub trait FastRebootSkeleton { +- #[rpc(name = "fast_reboot")] +- fn fast_reboot(&self, kernel_version: Option, force: bool) -> RpcResult<()>; +-} +diff --git a/syscared/src/rpc/skeleton/mod.rs b/syscared/src/rpc/skeleton/mod.rs +index 74456ca..6fa6b60 100644 +--- a/syscared/src/rpc/skeleton/mod.rs ++++ b/syscared/src/rpc/skeleton/mod.rs +@@ -14,8 +14,6 @@ + + use super::function; + +-mod fast_reboot; + mod patch; + +-pub use fast_reboot::*; + pub use patch::*; +diff --git a/syscared/src/rpc/skeleton_impl/fast_reboot.rs b/syscared/src/rpc/skeleton_impl/fast_reboot.rs +deleted file mode 100644 +index aeab458..0000000 +--- a/syscared/src/rpc/skeleton_impl/fast_reboot.rs ++++ /dev/null +@@ -1,42 +0,0 @@ +-// SPDX-License-Identifier: Mulan PSL v2 +-/* +- * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * syscared is licensed under Mulan PSL v2. +- * You can use this software according to the terms and conditions of the Mulan PSL v2. +- * You may obtain a copy of Mulan PSL v2 at: +- * http://license.coscl.org.cn/MulanPSL2 +- * +- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, +- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, +- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. +- * See the Mulan PSL v2 for more details. +- */ +- +-use anyhow::{Context, Result}; +- +-use crate::fast_reboot::{KExecManager, RebootOption}; +-use log::info; +- +-use super::{ +- function::{RpcFunction, RpcResult}, +- skeleton::FastRebootSkeleton, +-}; +- +-pub struct FastRebootSkeletonImpl; +- +-impl FastRebootSkeleton for FastRebootSkeletonImpl { +- fn fast_reboot(&self, kernel_version: Option, force: bool) -> RpcResult<()> { +- RpcFunction::call(move || -> Result<()> { +- info!("Rebooting system..."); +- +- KExecManager::load_kernel(kernel_version) +- .and_then(|_| { +- KExecManager::execute(match force { +- true => RebootOption::Forced, +- false => RebootOption::Normal, +- }) +- }) +- .context("Failed to reboot system") +- }) +- } +-} +diff --git a/syscared/src/rpc/skeleton_impl/mod.rs b/syscared/src/rpc/skeleton_impl/mod.rs +index a238df4..7037946 100644 +--- a/syscared/src/rpc/skeleton_impl/mod.rs ++++ b/syscared/src/rpc/skeleton_impl/mod.rs +@@ -15,8 +15,6 @@ + use super::function; + use super::skeleton; + +-mod fast_reboot; + mod patch; + +-pub use fast_reboot::*; + pub use patch::*; +-- +2.34.1 + diff --git a/0027-abi-reexport-uuid.patch b/0027-abi-reexport-uuid.patch new file mode 100644 index 0000000..10f1d8f --- /dev/null +++ b/0027-abi-reexport-uuid.patch @@ -0,0 +1,37 @@ +From c22716401d7f76ba6bccfa5ee2cbb694d298d385 Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Fri, 31 May 2024 17:18:16 +0800 +Subject: [PATCH] abi: reexport uuid + +Signed-off-by: liuxiaobo +--- + syscare-abi/Cargo.toml | 2 +- + syscare-abi/src/lib.rs | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/syscare-abi/Cargo.toml b/syscare-abi/Cargo.toml +index f086850..a3af2be 100644 +--- a/syscare-abi/Cargo.toml ++++ b/syscare-abi/Cargo.toml +@@ -10,4 +10,4 @@ build = "build.rs" + + [dependencies] + serde = { version = "1.0", features = ["derive"] } +-uuid = { version = "0.8", features = ["v4"] } ++uuid = { version = "0.8", features = ["v4", "serde"] } +diff --git a/syscare-abi/src/lib.rs b/syscare-abi/src/lib.rs +index 6600099..881587c 100644 +--- a/syscare-abi/src/lib.rs ++++ b/syscare-abi/src/lib.rs +@@ -12,6 +12,8 @@ + * See the Mulan PSL v2 for more details. + */ + ++pub use uuid::Uuid; ++ + mod package_info; + mod patch_info; + mod patch_status; +-- +2.34.1 + diff --git a/0028-all-add-c-rust-compilation-options.patch b/0028-all-add-c-rust-compilation-options.patch new file mode 100644 index 0000000..669e969 --- /dev/null +++ b/0028-all-add-c-rust-compilation-options.patch @@ -0,0 +1,2283 @@ +From c02c494ce4018c6eb8377128e747eafe4fb187e2 Mon Sep 17 00:00:00 2001 +From: ningyu +Date: Wed, 5 Jun 2024 03:08:47 +0000 +Subject: [PATCH] all: add c & rust compilation options + +Signed-off-by: ningyu +--- + CMakeLists.txt | 13 ++- + upatch-diff/create-diff-object.c | 38 +++---- + upatch-diff/elf-common.c | 8 +- + upatch-diff/elf-common.h | 14 +-- + upatch-diff/elf-compare.c | 10 +- + upatch-diff/elf-correlate.c | 16 +-- + upatch-diff/elf-create.c | 22 ++--- + upatch-diff/elf-create.h | 4 +- + upatch-diff/elf-debug.c | 14 +-- + upatch-diff/elf-insn.c | 4 +- + upatch-diff/insn/asm/inat.h | 4 +- + upatch-diff/insn/asm/insn.h | 6 +- + upatch-diff/insn/insn.c | 4 +- + upatch-diff/list.h | 2 +- + upatch-diff/running-elf.c | 11 +-- + upatch-diff/upatch-elf.c | 6 +- + upatch-diff/upatch-elf.h | 2 +- + upatch-hijacker/hijacker/gnu-as-hijacker.c | 10 +- + .../hijacker/gnu-compiler-hijacker.c | 4 +- + upatch-hijacker/hijacker/hijacker.h | 4 +- + upatch-manage/arch/aarch64/insn.c | 12 +-- + upatch-manage/arch/aarch64/insn.h | 4 +- + upatch-manage/arch/aarch64/ptrace.c | 53 +++++----- + upatch-manage/arch/aarch64/relocation.c | 98 +++++++++---------- + upatch-manage/arch/x86_64/ptrace.c | 41 ++++---- + upatch-manage/arch/x86_64/relocation.c | 5 +- + upatch-manage/arch/x86_64/resolve.c | 3 +- + upatch-manage/upatch-common.h | 4 +- + upatch-manage/upatch-elf.c | 16 +-- + upatch-manage/upatch-elf.h | 12 +-- + upatch-manage/upatch-manage.c | 24 ++--- + upatch-manage/upatch-patch.c | 79 +++++++-------- + upatch-manage/upatch-process.c | 33 ++++--- + upatch-manage/upatch-process.h | 2 +- + upatch-manage/upatch-ptrace.c | 45 ++++----- + upatch-manage/upatch-ptrace.h | 25 ++--- + upatch-manage/upatch-resolve.c | 17 ++-- + upatch-manage/upatch-resolve.h | 2 +- + 38 files changed, 324 insertions(+), 347 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7838a8..4858ba5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,8 +54,15 @@ message("---------------------------------------------------------") + + # Compile options + add_compile_options(-DBUILD_VERSION="${BUILD_VERSION}") +-add_compile_options(-g -Wall -O2 -fPIE) +- ++add_compile_options(-std=gnu99 -g -Wall -D_FORTIFY_SOURCE=2 -O2 -Werror -Wextra ++ -Wtrampolines -Wformat=2 -Wstrict-prototypes -Wdate-time -Wstack-usage=8192 ++ -Wfloat-equal -Wswitch-default -Wshadow -Wconversion -Wcast-qual -Wcast-align ++ -Wunused -Wundef -funsigned-char -fstack-protector-all -fpic -fpie -ftrapv ++ -fstack-check -freg-struct-return -fno-canonical-system-headers -pipe ++ -fdebug-prefix-map=old=new) ++set(LINK_FLAGS "-pie -Wl,-z,relro,-z,now -Wl,-z,noexecstack -rdynamic -Wl,-Bsymbolic -Wl,-no-undefined") ++set(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS}") ++set(CMAKE_EXE_LINKER_FLAGS "${LINK_FLAGS}") + # Subdirectories + add_subdirectory(upatch-diff) + add_subdirectory(upatch-manage) +@@ -67,7 +74,7 @@ add_custom_target(rust-executables ALL + COMMENT "Building rust executables..." + COMMAND ${CMAKE_COMMAND} -E env + "BUILD_VERSION=${BUILD_VERSION}" +- "RUSTFLAGS=--cfg unsound_local_offset" ++ "RUSTFLAGS=--cfg unsound_local_offset -C relocation_model=pic -D warnings -C link-arg=-s -C overflow_checks -W rust_2021_incompatible_closure_captures" + cargo build --release --target-dir ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) +diff --git a/upatch-diff/create-diff-object.c b/upatch-diff/create-diff-object.c +index 1a05869..6474b22 100644 +--- a/upatch-diff/create-diff-object.c ++++ b/upatch-diff/create-diff-object.c +@@ -76,11 +76,11 @@ struct arguments { + }; + + static struct argp_option options[] = { +- {"debug", 'd', NULL, 0, "Show debug output"}, +- {"source", 's', "source", 0, "Source object"}, +- {"patched", 'p', "patched", 0, "Patched object"}, +- {"running", 'r', "running", 0, "Running binary file"}, +- {"output", 'o', "output", 0, "Output object"}, ++ {"debug", 'd', NULL, 0, "Show debug output", 0}, ++ {"source", 's', "source", 0, "Source object", 0}, ++ {"patched", 'p', "patched", 0, "Patched object", 0}, ++ {"running", 'r', "running", 0, "Running binary file", 0}, ++ {"output", 'o', "output", 0, "Output object", 0}, + {NULL} + }; + +@@ -136,7 +136,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) + return 0; + } + +-static struct argp argp = {options, parse_opt, args_doc, program_doc}; ++static struct argp argp = {options, parse_opt, args_doc, program_doc, NULL, NULL, NULL}; + + /* + * Key point for chreate-diff-object: +@@ -266,7 +266,7 @@ static void bundle_symbols(struct upatch_elf *uelf) + list_for_each_entry(sym, &uelf->symbols, list) { + if (is_bundleable(sym)) { + if (sym->sym.st_value != 0 && +- is_gcc6_localentry_bundled_sym(uelf, sym)) { ++ is_gcc6_localentry_bundled_sym(uelf)) { + ERROR("Symbol '%s' at offset %lu within section '%s', expected 0.", + sym->name, sym->sym.st_value, sym->sec->name); + } +@@ -301,7 +301,7 @@ static void detect_child_functions(struct upatch_elf *uelf) + if (!childstr) + continue; + +- pname = strndup(sym->name, childstr - sym->name); ++ pname = strndup(sym->name, (size_t)(childstr - sym->name)); + log_debug("symbol '%s', pname: '%s'\n", sym->name, pname); + if (!pname) + ERROR("detect_child_functions strndup failed."); +@@ -576,8 +576,8 @@ static void replace_section_syms(struct upatch_elf *uelf) + if (sym->type == STT_SECTION || sym->sec != rela->sym->sec) + continue; + +- start = sym->sym.st_value; +- end = sym->sym.st_value + sym->sym.st_size; ++ start = (long)sym->sym.st_value; ++ end = (long)(sym->sym.st_value + sym->sym.st_size); + + /* text section refer other sections */ + if (is_text_section(relasec->base) && +@@ -638,7 +638,7 @@ static void replace_section_syms(struct upatch_elf *uelf) + if (!found && !is_string_literal_section(rela->sym->sec) && + strncmp(rela->sym->name, ".rodata", strlen(".rodata")) && + strncmp(rela->sym->name, ".data", strlen(".data"))) { +- ERROR("%s+0x%x: Cannot find replacement symbol for '%s+%ld' reference.", ++ ERROR("%s+0x%lx: Cannot find replacement symbol for '%s+%ld' reference.", + relasec->base->name, rela->offset, rela->sym->name, rela->addend); + } + } +@@ -662,8 +662,8 @@ static void mark_ignored_sections(struct upatch_elf *uelf) + } + + /* TODO: we do not handle it now */ +-static void mark_ignored_functions_same(struct upatch_elf *uelf) {} +-static void mark_ignored_sections_same(struct upatch_elf *uelf) {} ++static void mark_ignored_functions_same(void) {} ++static void mark_ignored_sections_same(void) {} + + /* + * For a local symbol referenced in the rela list of a changing function, +@@ -845,7 +845,7 @@ static void include_debug_sections(struct upatch_elf *uelf) + } + + /* currently, there si no special section need to be handled */ +-static void process_special_sections(struct upatch_elf *uelf) {} ++static void process_special_sections(void) {} + + static void verify_patchability(struct upatch_elf *uelf) + { +@@ -973,8 +973,8 @@ int main(int argc, char*argv[]) + mark_file_symbols(&uelf_source); + find_debug_symbol(&uelf_source, &relf); + +- mark_ignored_functions_same(&uelf_patched); +- mark_ignored_sections_same(&uelf_patched); ++ mark_ignored_functions_same(); ++ mark_ignored_sections_same(); + + upatch_elf_teardown(&uelf_source); + upatch_elf_free(&uelf_source); +@@ -990,7 +990,7 @@ int main(int argc, char*argv[]) + + include_debug_sections(&uelf_patched); + +- process_special_sections(&uelf_patched); ++ process_special_sections(); + + upatch_print_changes(&uelf_patched); + +@@ -1011,7 +1011,7 @@ int main(int argc, char*argv[]) + + upatch_create_intermediate_sections(&uelf_out, &relf); + +- create_kpatch_arch_section(&uelf_out); ++ create_kpatch_arch_section(); + + upatch_build_strings_section_data(&uelf_out); + +@@ -1029,7 +1029,7 @@ int main(int argc, char*argv[]) + + upatch_rebuild_relocations(&uelf_out); + +- upatch_check_relocations(&uelf_out); ++ upatch_check_relocations(); + + upatch_create_shstrtab(&uelf_out); + +diff --git a/upatch-diff/elf-common.c b/upatch-diff/elf-common.c +index f895e9b..a74da3a 100644 +--- a/upatch-diff/elf-common.c ++++ b/upatch-diff/elf-common.c +@@ -74,8 +74,10 @@ bool is_normal_static_local(struct symbol *sym) + if (!strchr(sym->name, '.')) + return false; + +- if (is_special_static(sym)) +- return false; ++ /* ++ * TODO: Special static local variables should never be correlated and should always ++ * be included if they are referenced by an included function. ++ */ + + return true; + } +@@ -97,7 +99,7 @@ int offset_of_string(struct list_head *list, char *name) + } + + // no need for X86 +-bool is_gcc6_localentry_bundled_sym(struct upatch_elf *uelf, struct symbol *sym) ++bool is_gcc6_localentry_bundled_sym(struct upatch_elf *uelf) + { + switch(uelf->arch) { + case AARCH64: +diff --git a/upatch-diff/elf-common.h b/upatch-diff/elf-common.h +index 9e44a7c..f3d4308 100644 +--- a/upatch-diff/elf-common.h ++++ b/upatch-diff/elf-common.h +@@ -103,7 +103,7 @@ static inline bool is_debug_section(struct section *sec) + !strncmp(name, ".eh_frame", 9); + } + +-static inline struct symbol *find_symbol_by_index(struct list_head *list, size_t index) ++static inline struct symbol *find_symbol_by_index(struct list_head *list, unsigned int index) + { + struct symbol *sym; + +@@ -174,16 +174,6 @@ static inline bool has_digit_tail(char *tail) + */ + int mangled_strcmp(char *, char *); + +- +-/* +- * TODO: Special static local variables should never be correlated and should always +- * be included if they are referenced by an included function. +- */ +-static inline bool is_special_static(struct symbol *sym){ +- /* Not need it now. */ +- return false; +-} +- + bool is_normal_static_local(struct symbol *); + + static inline char *section_function_name(struct section *sec) +@@ -243,7 +233,7 @@ static inline bool is_local_sym(struct symbol *sym) + return sym->bind == STB_LOCAL; + } + +-bool is_gcc6_localentry_bundled_sym(struct upatch_elf *, struct symbol *); ++bool is_gcc6_localentry_bundled_sym(struct upatch_elf *); + + /* + * Mapping symbols are used to mark and label the transitions between code and +diff --git a/upatch-diff/elf-compare.c b/upatch-diff/elf-compare.c +index ef8dd23..851c25f 100644 +--- a/upatch-diff/elf-compare.c ++++ b/upatch-diff/elf-compare.c +@@ -175,7 +175,7 @@ bool upatch_handle_redis_line(const char *symname) + } + + /* TODO: let user support this list or generate by the compiler ? */ +-bool check_line_func(struct upatch_elf *uelf, const char *symname) ++bool check_line_func(const char *symname) + { + if (!strncmp(basename(g_relf_name), "redis-server", 12)) + return upatch_handle_redis_line(symname); +@@ -247,7 +247,7 @@ static bool _line_macro_change_only(struct upatch_elf *uelf, struct section *sec + continue; + + /* TODO: we may need black list ? */ +- if (check_line_func(uelf, rela->sym->name)) { ++ if (check_line_func(rela->sym->name)) { + found = true; + break; + } +@@ -292,8 +292,8 @@ static bool _line_macro_change_only_aarch64(struct upatch_elf *uelf, struct sect + continue; + + /* verify it's a mov immediate to w1 */ +- if ((*(int *)(start1 + offset) & ~mov_imm_mask) != +- (*(int *)(start2 + offset) & ~mov_imm_mask)) ++ if ((*(unsigned int *)(start1 + offset) & ~mov_imm_mask) != ++ (*(unsigned int *)(start2 + offset) & ~mov_imm_mask)) + return false; + + found = false; +@@ -304,7 +304,7 @@ static bool _line_macro_change_only_aarch64(struct upatch_elf *uelf, struct sect + continue; + + /* TODO: we may need black list ? */ +- if (check_line_func(uelf, rela->sym->name)) { ++ if (check_line_func(rela->sym->name)) { + found = true; + break; + } +diff --git a/upatch-diff/elf-correlate.c b/upatch-diff/elf-correlate.c +index a0fe669..3e3a536 100644 +--- a/upatch-diff/elf-correlate.c ++++ b/upatch-diff/elf-correlate.c +@@ -58,9 +58,10 @@ void upatch_correlate_symbols(struct upatch_elf *uelf_source, struct upatch_elf + sym_orig->type != sym_patched->type || sym_patched->twin) + continue; + +- if (is_special_static(sym_orig)) +- continue; +- ++ /* ++ * TODO: Special static local variables should never be correlated and should always ++ * be included if they are referenced by an included function. ++ */ + /* + * The .LCx symbols point to string literals in + * '.rodata..str1.*' sections. They get included +@@ -140,11 +141,10 @@ void upatch_correlate_sections(struct upatch_elf *uelf_source, struct upatch_elf + sec_patched->twin) + continue; + +- if (is_special_static(is_rela_section(sec_orig) ? +- sec_orig->base->secsym : +- sec_orig->secsym)) +- continue; +- ++ /* ++ * TODO: Special static local variables should never be correlated and should always ++ * be included if they are referenced by an included function. ++ */ + /* + * Group sections must match exactly to be correlated. + */ +diff --git a/upatch-diff/elf-create.c b/upatch-diff/elf-create.c +index 873b3a9..8ac212a 100644 +--- a/upatch-diff/elf-create.c ++++ b/upatch-diff/elf-create.c +@@ -37,7 +37,7 @@ + + /* create text and relocation sections */ + static struct section *create_section_pair(struct upatch_elf *uelf, char *name, +- int entsize, int nr) ++ unsigned int entsize, unsigned int nr) + { + char *relaname; + struct section *sec, *relasec; +@@ -131,7 +131,7 @@ void upatch_create_patches_sections(struct upatch_elf *uelf, struct running_elf + struct upatch_patch_func *funcs; + struct rela *rela; + struct lookup_result symbol; +- int nr = 0, index = 0; ++ unsigned int nr = 0, index = 0; + + /* find changed func */ + list_for_each_entry(sym, &uelf->symbols, list) { +@@ -197,7 +197,7 @@ void upatch_create_patches_sections(struct upatch_elf *uelf, struct running_elf + ERROR("sanity check failed in funcs sections. \n"); + } + +-static bool need_dynrela(struct upatch_elf *uelf, struct running_elf *relf, ++static bool need_dynrela(struct running_elf *relf, + struct section *relasec, struct rela *rela) + { + struct lookup_result symbol; +@@ -234,7 +234,7 @@ void upatch_create_intermediate_sections(struct upatch_elf *uelf, struct running + struct upatch_symbol *usyms; + struct upatch_relocation *urelas; + struct symbol *strsym, *usym_sec_sym; +- int nr = 0, index = 0; ++ unsigned int nr = 0, index = 0; + + list_for_each_entry(relasec, &uelf->sections, list) { + if (!is_rela_section(relasec)) +@@ -245,7 +245,7 @@ void upatch_create_intermediate_sections(struct upatch_elf *uelf, struct running + + list_for_each_entry(rela, &relasec->relas, list) { + nr++; +- if (need_dynrela(uelf, relf, relasec, rela)){ ++ if (need_dynrela(relf, relasec, rela)){ + rela->need_dynrela = 1; + } + } +@@ -401,7 +401,7 @@ static void rebuild_rela_section_data(struct section *sec) + struct rela *rela; + GElf_Rela *relas; + size_t size; +- int nr = 0, index = 0; ++ unsigned int nr = 0, index = 0; + + list_for_each_entry(rela, &sec->relas, list) + nr++; +@@ -438,13 +438,13 @@ void upatch_rebuild_relocations(struct upatch_elf *uelf) + list_for_each_entry(relasec, &uelf->sections, list) { + if (!is_rela_section(relasec)) + continue; +- relasec->sh.sh_link = symtab->index; +- relasec->sh.sh_info = relasec->base->index; ++ relasec->sh.sh_link = (Elf64_Word)symtab->index; ++ relasec->sh.sh_info = (Elf64_Word)relasec->base->index; + rebuild_rela_section_data(relasec); + } + } + +-void upatch_check_relocations(struct upatch_elf *uelf) ++void upatch_check_relocations(void) + { + log_debug("upatch_check_relocations does not work now.\n"); + return; +@@ -558,7 +558,7 @@ void upatch_create_symtab(struct upatch_elf *uelf) + struct symbol *sym; + size_t size; + char *buf; +- int nr = 0, nr_local = 0; ++ unsigned int nr = 0, nr_local = 0; + unsigned long offset = 0; + + symtab = find_section_by_name(&uelf->sections, ".symtab"); +@@ -591,7 +591,7 @@ void upatch_create_symtab(struct upatch_elf *uelf) + if (!strtab) + ERROR("missing .strtab section in create symtab."); + +- symtab->sh.sh_link = strtab->index; ++ symtab->sh.sh_link = (Elf64_Word)strtab->index; + symtab->sh.sh_info = nr_local; + } + +diff --git a/upatch-diff/elf-create.h b/upatch-diff/elf-create.h +index 1b4dc6c..ce7f263 100644 +--- a/upatch-diff/elf-create.h ++++ b/upatch-diff/elf-create.h +@@ -33,7 +33,7 @@ void upatch_create_patches_sections(struct upatch_elf *, struct running_elf *); + + void upatch_create_intermediate_sections(struct upatch_elf *, struct running_elf *); + +-static inline void create_kpatch_arch_section(struct upatch_elf *uelf) {} ++static inline void create_kpatch_arch_section(void) {} + + void upatch_build_strings_section_data(struct upatch_elf *); + +@@ -45,7 +45,7 @@ void upatch_reindex_elements(struct upatch_elf *); + + void upatch_rebuild_relocations(struct upatch_elf *); + +-void upatch_check_relocations(struct upatch_elf *); ++void upatch_check_relocations(void); + + void upatch_create_shstrtab(struct upatch_elf *); + +diff --git a/upatch-diff/elf-debug.c b/upatch-diff/elf-debug.c +index f9c5327..eaabfa1 100644 +--- a/upatch-diff/elf-debug.c ++++ b/upatch-diff/elf-debug.c +@@ -60,7 +60,7 @@ void upatch_dump_kelf(struct upatch_elf *uelf) + goto next; + log_debug("rela section expansion\n"); + list_for_each_entry(rela, &sec->relas, list) { +- log_debug("sym %d, offset %d, type %d, %s %s %ld \n", ++ log_debug("sym %d, offset %ld, type %d, %s %s %ld \n", + rela->sym->index, rela->offset, + rela->type, rela->sym->name, + (rela->addend < 0) ? "-" : "+", +@@ -107,7 +107,7 @@ void upatch_rebuild_eh_frame(struct section *sec) + struct rela *rela; + unsigned char *data, *data_end; + unsigned int hdr_length, hdr_id; +- unsigned int current_offset; ++ unsigned long current_offset; + unsigned int count = 0; + + /* sanity check */ +@@ -136,13 +136,13 @@ void upatch_rebuild_eh_frame(struct section *sec) + /* 8 is the offset of PC begin */ + current_offset = 8; + list_for_each_entry(rela, &sec->rela->relas, list) { +- unsigned int offset = rela->offset; ++ unsigned long offset = rela->offset; + bool found_rela = false; +- log_debug("handle relocaton offset at 0x%x \n", offset); ++ log_debug("handle relocaton offset at 0x%lx \n", offset); + while (data != data_end) { + void *__src = data; + +- log_debug("current handle offset is 0x%x \n", current_offset); ++ log_debug("current handle offset is 0x%lx \n", current_offset); + + REQUIRE(skip_bytes(&data, data_end, 4), "no length to be read"); + hdr_length = *(unsigned int *)(data - 4); +@@ -166,13 +166,13 @@ void upatch_rebuild_eh_frame(struct section *sec) + /* update rela offset to point to new offset, and also hdr_id */ + if (found_rela) { + /* 4 is the offset of hdr_id and 8 is the offset of PC begin */ +- *(unsigned int *)(eh_frame + frame_size + 4) = frame_size + 4; ++ *(unsigned long *)(eh_frame + frame_size + 4) = frame_size + 4; + rela->offset = frame_size + 8; + } + + frame_size += (hdr_length + 4); + } else { +- log_debug("remove FDE at 0x%x \n", current_offset); ++ log_debug("remove FDE at 0x%lx \n", current_offset); + } + + /* hdr_length(value) + hdr_length(body) */ +diff --git a/upatch-diff/elf-insn.c b/upatch-diff/elf-insn.c +index 41252fe..11380d0 100644 +--- a/upatch-diff/elf-insn.c ++++ b/upatch-diff/elf-insn.c +@@ -50,7 +50,7 @@ void rela_insn(const struct section *sec, const struct rela *rela, struct insn * + return; + } + +- ERROR("can't find instruction for rela at %s+0x%x", ++ ERROR("can't find instruction for rela at %s+0x%lx", + sec->name, rela->offset); + } + +@@ -75,7 +75,7 @@ long rela_target_offset(struct upatch_elf *uelf, struct section *relasec, struct + rela_insn(sec, rela, &insn); + add_off = (long)insn.next_byte - + (long)sec->data->d_buf - +- rela->offset; ++ (long)rela->offset; + } else { + ERROR("unable to handle rela type %d \n", rela->type); + } +diff --git a/upatch-diff/insn/asm/inat.h b/upatch-diff/insn/asm/inat.h +index 95811f3..f446ad8 100644 +--- a/upatch-diff/insn/asm/inat.h ++++ b/upatch-diff/insn/asm/inat.h +@@ -171,9 +171,9 @@ static inline int inat_group_id(insn_attr_t attr) + return (attr & INAT_GRP_MASK) >> INAT_GRP_OFFS; + } + +-static inline int inat_group_common_attribute(insn_attr_t attr) ++static inline insn_attr_t inat_group_common_attribute(insn_attr_t attr) + { +- return attr & ~INAT_GRP_MASK; ++ return attr & ~(insn_attr_t)INAT_GRP_MASK; + } + + static inline int inat_has_immediate(insn_attr_t attr) +diff --git a/upatch-diff/insn/asm/insn.h b/upatch-diff/insn/asm/insn.h +index 041b351..fc4ae40 100644 +--- a/upatch-diff/insn/asm/insn.h ++++ b/upatch-diff/insn/asm/insn.h +@@ -66,7 +66,7 @@ struct insn { + unsigned char x86_64; + + const insn_byte_t *kaddr; /* kernel address of insn to analyze */ +- const insn_byte_t *next_byte; ++ insn_byte_t *next_byte; + }; + + #define MAX_INSN_SIZE 16 +@@ -97,7 +97,7 @@ struct insn { + #define X86_VEX_P(vex) ((vex) & 0x03) /* VEX3 Byte2, VEX2 Byte1 */ + #define X86_VEX_M_MAX 0x1f /* VEX3.M Maximum value */ + +-extern void insn_init(struct insn *insn, const void *kaddr, int x86_64); ++extern void insn_init(struct insn *insn, void *kaddr, int x86_64); + extern void insn_get_prefixes(struct insn *insn); + extern void insn_get_opcode(struct insn *insn); + extern void insn_get_modrm(struct insn *insn); +@@ -116,7 +116,7 @@ static inline void insn_get_attribute(struct insn *insn) + extern int insn_rip_relative(struct insn *insn); + + /* Init insn for kernel text */ +-static inline void kernel_insn_init(struct insn *insn, const void *kaddr) ++static inline void kernel_insn_init(struct insn *insn, void *kaddr) + { + #ifdef CONFIG_X86_64 + insn_init(insn, kaddr, 1); +diff --git a/upatch-diff/insn/insn.c b/upatch-diff/insn/insn.c +index 6dfca32..d9a356b 100644 +--- a/upatch-diff/insn/insn.c ++++ b/upatch-diff/insn/insn.c +@@ -49,7 +49,7 @@ + * @kaddr: address (in kernel memory) of instruction (or copy thereof) + * @x86_64: !0 for 64-bit kernel or 64-bit app + */ +-void insn_init(struct insn *insn, const void *kaddr, int x86_64) ++void insn_init(struct insn *insn, void *kaddr, int x86_64) + { + memset(insn, 0, sizeof(*insn)); + insn->kaddr = kaddr; +@@ -250,7 +250,7 @@ void insn_get_modrm(struct insn *insn) + modrm->value = mod; + modrm->nbytes = 1; + if (inat_is_group(insn->attr)) { +- pfx_id = insn_last_prefix_id(insn); ++ pfx_id = (insn_byte_t)insn_last_prefix_id(insn); + insn->attr = inat_get_group_attribute(mod, pfx_id, + insn->attr); + if (insn_is_avx(insn) && !inat_accept_vex(insn->attr)) +diff --git a/upatch-diff/list.h b/upatch-diff/list.h +index 6205a72..b3b28e1 100644 +--- a/upatch-diff/list.h ++++ b/upatch-diff/list.h +@@ -49,7 +49,7 @@ + * + */ + #define container_of(ptr, type, member) ({ \ +- const typeof( ((type *)0)->member ) *__mptr = (ptr); \ ++ typeof( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) + + /** +diff --git a/upatch-diff/running-elf.c b/upatch-diff/running-elf.c +index 676880f..25b72b7 100644 +--- a/upatch-diff/running-elf.c ++++ b/upatch-diff/running-elf.c +@@ -38,7 +38,7 @@ + /* TODO: need to judge whether running_elf is a Position-Independent Executable file + * https://github.com/bminor/binutils-gdb/blob/master/binutils/readelf.c + */ +-static bool is_pie(struct Elf *elf) ++static bool is_pie(void) + { + return true; + } +@@ -50,7 +50,7 @@ static bool is_exec(struct Elf *elf) + if (!gelf_getehdr(elf, &ehdr)) + ERROR("gelf_getehdr running_file failed for %s.", elf_errmsg(0)); + +- return ehdr.e_type == ET_EXEC || (ehdr.e_type == ET_DYN && is_pie(elf)); ++ return ehdr.e_type == ET_EXEC || (ehdr.e_type == ET_DYN && is_pie()); + } + + void relf_init(char *elf_name, struct running_elf *relf) +@@ -59,7 +59,6 @@ void relf_init(char *elf_name, struct running_elf *relf) + Elf_Scn *scn = NULL; + Elf_Data *data; + GElf_Sym sym; +- unsigned int i; + + relf->fd = open(elf_name, O_RDONLY); + if (relf->fd == -1) +@@ -83,12 +82,12 @@ void relf_init(char *elf_name, struct running_elf *relf) + if (!data) + ERROR("elf_getdata with error %s", elf_errmsg(0)); + +- relf->obj_nr = shdr.sh_size / shdr.sh_entsize; +- relf->obj_syms = calloc(relf->obj_nr, sizeof(struct debug_symbol)); ++ relf->obj_nr = (int)(shdr.sh_size / shdr.sh_entsize); ++ relf->obj_syms = calloc((size_t)relf->obj_nr, sizeof(struct debug_symbol)); + if (!relf->obj_syms) + ERROR("calloc with errno = %d", errno); + +- for (i = 0; i < relf->obj_nr; i ++) { ++ for (int i = 0; i < relf->obj_nr; i ++) { + if (!gelf_getsym(data, i, &sym)) + ERROR("gelf_getsym with error %s", elf_errmsg(0)); + relf->obj_syms[i].name = elf_strptr(relf->elf, shdr.sh_link, sym.st_name); +diff --git a/upatch-diff/upatch-elf.c b/upatch-diff/upatch-elf.c +index fc4396a..ee38efc 100644 +--- a/upatch-diff/upatch-elf.c ++++ b/upatch-diff/upatch-elf.c +@@ -106,7 +106,7 @@ static void create_symbol_list(struct upatch_elf *uelf) + INIT_LIST_HEAD(&sym->children); + + sym->index = index; +- if (!gelf_getsym(symtab->data, index, &sym->sym)) ++ if (!gelf_getsym(symtab->data, (int)index, &sym->sym)) + ERROR("gelf_getsym with error %s", elf_errmsg(0)); + + index ++; +@@ -122,7 +122,7 @@ static void create_symbol_list(struct upatch_elf *uelf) + /* releated section located in extended header */ + if (shndx == SHN_XINDEX && + !gelf_getsymshndx(symtab->data, uelf->symtab_shndx, +- sym->index, &sym->sym, &shndx)) ++ (int)sym->index, &sym->sym, &shndx)) + ERROR("gelf_getsymshndx with error %s", elf_errmsg(0)); + + if ((sym->sym.st_shndx > SHN_UNDEF && sym->sym.st_shndx < SHN_LORESERVE) || +@@ -206,7 +206,7 @@ static void create_rela_list(struct upatch_elf *uelf, struct section *relasec) + if (skip) + continue; + +- log_debug("offset %d, type %d, %s %s %ld", rela->offset, ++ log_debug("offset %ld, type %d, %s %s %ld", rela->offset, + rela->type, rela->sym->name, + (rela->addend < 0) ? "-" : "+", labs(rela->addend)); + if (rela->string) // rela->string is not utf8 +diff --git a/upatch-diff/upatch-elf.h b/upatch-diff/upatch-elf.h +index b2d038b..3cbb59b 100644 +--- a/upatch-diff/upatch-elf.h ++++ b/upatch-diff/upatch-elf.h +@@ -87,7 +87,7 @@ struct rela { + GElf_Rela rela; + struct symbol *sym; + unsigned int type; +- unsigned int offset; ++ unsigned long offset; + long addend; + char *string; + bool need_dynrela; +diff --git a/upatch-hijacker/hijacker/gnu-as-hijacker.c b/upatch-hijacker/hijacker/gnu-as-hijacker.c +index 789ddc2..860a84f 100644 +--- a/upatch-hijacker/hijacker/gnu-as-hijacker.c ++++ b/upatch-hijacker/hijacker/gnu-as-hijacker.c +@@ -28,11 +28,9 @@ + + #define DEFSYM_MAX 64 + +-static const char *DEFSYM_FLAG = "--defsym"; +-static const char *DEFSYM_VALUE = ".upatch_0x%x="; ++static char *DEFSYM_FLAG = "--defsym"; + static const int APPEND_ARG_LEN = 2; + +-static const char *OUTPUT_PATH = "%s/0x%x.o"; + static const char *NULL_DEV_PATH = "/dev/null"; + + static char g_defsym[DEFSYM_MAX] = { 0 }; +@@ -81,7 +79,7 @@ int main(int argc, char *argv[], char *envp[]) + } + + int new_argc = argc + APPEND_ARG_LEN + 1; // include terminator NULL +- const char **new_argv = calloc(1, new_argc * sizeof(char *)); ++ char **new_argv = calloc(1, (unsigned long)new_argc * sizeof(char *)); + if (new_argv == NULL) { + return execve(filename, argv, envp); + } +@@ -100,13 +98,13 @@ int main(int argc, char *argv[], char *envp[]) + char *defsym_value = (char *)g_defsym; + char *new_output_file = (char *)g_new_output_file; + +- snprintf(defsym_value, DEFSYM_MAX, DEFSYM_VALUE, tid); ++ snprintf(defsym_value, DEFSYM_MAX, ".upatch_0x%x=", tid); + new_argv[new_argc++] = DEFSYM_FLAG; + new_argv[new_argc++] = defsym_value; + new_argv[new_argc] = NULL; + + // Handle output file +- snprintf(new_output_file, PATH_MAX, OUTPUT_PATH, output_dir, tid); ++ snprintf(new_output_file, PATH_MAX, "%s/0x%x.o", output_dir, tid); + new_argv[output_index] = new_output_file; + + if (access(output_file, F_OK) == 0) { +diff --git a/upatch-hijacker/hijacker/gnu-compiler-hijacker.c b/upatch-hijacker/hijacker/gnu-compiler-hijacker.c +index d0410a2..d868467 100644 +--- a/upatch-hijacker/hijacker/gnu-compiler-hijacker.c ++++ b/upatch-hijacker/hijacker/gnu-compiler-hijacker.c +@@ -16,7 +16,7 @@ + + #include "hijacker.h" + +-static const char* APPEND_ARGS[] = { ++static char* APPEND_ARGS[] = { + "-gdwarf", /* obatain debug information */ + "-ffunction-sections", + "-fdata-sections", +@@ -52,7 +52,7 @@ int main(int argc, char *argv[], char *envp[]) + } + + int new_argc = argc + APPEND_ARG_LEN + 1; // include terminator NULL +- const char **new_argv = calloc(1, new_argc * sizeof(char *)); ++ char **new_argv = calloc(1, (unsigned long)new_argc * sizeof(char *)); + if (new_argv == NULL) { + return execve(filename, argv, envp); + } +diff --git a/upatch-hijacker/hijacker/hijacker.h b/upatch-hijacker/hijacker/hijacker.h +index 2a41ab2..cc820ee 100644 +--- a/upatch-hijacker/hijacker/hijacker.h ++++ b/upatch-hijacker/hijacker/hijacker.h +@@ -28,7 +28,7 @@ static const char *OUTPUT_FLAG_NAME = "-o"; + + static char g_filename[PATH_MAX] = { 0 }; + +-static inline char* get_current_exec() ++static inline char* get_current_exec(void) + { + ssize_t path_len = readlink(EXEC_SELF_PATH, (char *)g_filename, PATH_MAX); + if (path_len == -1) { +@@ -39,7 +39,7 @@ static inline char* get_current_exec() + return (char *)g_filename; + } + +-static inline const char* get_hijacker_env() ++static inline const char* get_hijacker_env(void) + { + return getenv(UPATCH_ENV_NAME); + } +diff --git a/upatch-manage/arch/aarch64/insn.c b/upatch-manage/arch/aarch64/insn.c +index 8f78ae1..bb61f77 100644 +--- a/upatch-manage/arch/aarch64/insn.c ++++ b/upatch-manage/arch/aarch64/insn.c +@@ -97,17 +97,17 @@ u32 aarch64_insn_encode_immediate(enum aarch64_insn_imm_type type, u32 insn, + + /* Update the immediate field. */ + insn &= ~(mask << shift); +- insn |= (imm & mask) << shift; ++ insn |= (u32)(imm & mask) << shift; + + return insn; + } + +-u64 extract_insn_imm(s64 sval, int len, int lsb) ++s64 extract_insn_imm(s64 sval, int len, int lsb) + { +- u64 imm, imm_mask; ++ s64 imm, imm_mask; + + imm = sval >> lsb; +- imm_mask = (BIT(lsb + len) - 1) >> lsb; ++ imm_mask = (s64)((BIT(lsb + len) - 1) >> lsb); + imm = imm & imm_mask; + + log_debug("upatch: extract imm, X=0x%lx, X[%d:%d]=0x%lx\n", sval, +@@ -115,7 +115,7 @@ u64 extract_insn_imm(s64 sval, int len, int lsb) + return imm; + } + +-u32 insert_insn_imm(enum aarch64_insn_imm_type imm_type, void *place, u64 imm) ++s32 insert_insn_imm(enum aarch64_insn_imm_type imm_type, void *place, u64 imm) + { + u32 insn, new_insn; + +@@ -126,5 +126,5 @@ u32 insert_insn_imm(enum aarch64_insn_imm_type imm_type, void *place, u64 imm) + "upatch: insert imm, P=0x%lx, insn=0x%x, imm_type=%d, imm=0x%lx, " + "new_insn=0x%x\n", + (u64)place, insn, imm_type, imm, new_insn); +- return new_insn; ++ return (s32)new_insn; + } +diff --git a/upatch-manage/arch/aarch64/insn.h b/upatch-manage/arch/aarch64/insn.h +index 2b97e8d..76a9689 100644 +--- a/upatch-manage/arch/aarch64/insn.h ++++ b/upatch-manage/arch/aarch64/insn.h +@@ -64,8 +64,8 @@ enum aarch64_insn_imm_type { + u32 aarch64_insn_encode_immediate(enum aarch64_insn_imm_type type, u32 insn, + u64 imm); + +-u64 extract_insn_imm(s64, int, int); ++s64 extract_insn_imm(s64, int, int); + +-u32 insert_insn_imm(enum aarch64_insn_imm_type, void *, u64); ++s32 insert_insn_imm(enum aarch64_insn_imm_type, void *, u64); + + #endif /* _ARCH_AARCH64_INSN_H */ +diff --git a/upatch-manage/arch/aarch64/ptrace.c b/upatch-manage/arch/aarch64/ptrace.c +index c51a236..fdc7695 100644 +--- a/upatch-manage/arch/aarch64/ptrace.c ++++ b/upatch-manage/arch/aarch64/ptrace.c +@@ -21,13 +21,14 @@ + #include + #include + #include ++#include + + #include "insn.h" + #include "upatch-ptrace.h" + + #define ORIGIN_INSN_LEN 16 + +-int upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, ++long upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, + unsigned long arg1, unsigned long arg2, + unsigned long arg3, unsigned long arg4, + unsigned long arg5, unsigned long arg6, +@@ -38,10 +39,10 @@ int upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, + 0x01, 0x00, 0x00, 0xd4, // 0xd4000001 svc #0 = syscall + 0xa0, 0x00, 0x20, 0xd4, // 0xd42000a0 brk #5 = int3 + }; +- int ret; ++ long ret; + + log_debug("Executing syscall %d (pid %d)...\n", nr, pctx->pid); +- regs.regs[8] = (unsigned long)nr; ++ regs.regs[8] = (unsigned long long)nr; + regs.regs[0] = arg1; + regs.regs[1] = arg2; + regs.regs[2] = arg3; +@@ -56,39 +57,45 @@ int upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, + return ret; + } + +-int upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, ++long upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, + const unsigned char *code, size_t codelen, + struct user_regs_struct *pregs, + int (*func)(struct upatch_ptrace_ctx *pctx, + const void *data), + const void *data) + { ++ long ret; + struct user_regs_struct orig_regs, regs; + struct iovec orig_regs_iov, regs_iov; ++ struct upatch_process *proc = pctx->proc; ++ unsigned long libc_base = proc->libc_base; ++ unsigned char *orig_code = (unsigned char *)malloc(sizeof(*orig_code) * codelen); ++ ++ if (orig_code == NULL) { ++ log_error("Malloc orig_code failed\n"); ++ return -1; ++ } + + orig_regs_iov.iov_base = &orig_regs; + orig_regs_iov.iov_len = sizeof(orig_regs); + regs_iov.iov_base = ®s; + regs_iov.iov_len = sizeof(regs); + +- unsigned char orig_code[codelen]; +- int ret; +- struct upatch_process *proc = pctx->proc; +- unsigned long libc_base = proc->libc_base; +- + ret = ptrace(PTRACE_GETREGSET, pctx->pid, (void *)NT_PRSTATUS, + (void *)&orig_regs_iov); + if (ret < 0) { + log_error("can't get regs - %d\n", pctx->pid); ++ free(orig_code); + return -1; + } + ret = upatch_process_mem_read(proc, libc_base, + (unsigned long *)orig_code, codelen); + if (ret < 0) { + log_error("can't peek original code - %d\n", pctx->pid); ++ free(orig_code); + return -1; + } +- ret = upatch_process_mem_write(proc, (unsigned long *)code, libc_base, ++ ret = upatch_process_mem_write(proc, code, libc_base, + codelen); + if (ret < 0) { + log_error("can't poke syscall code - %d\n", pctx->pid); +@@ -132,6 +139,7 @@ int upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, + poke_back: + upatch_process_mem_write(proc, (unsigned long *)orig_code, libc_base, + codelen); ++ free(orig_code); + return ret; + } + +@@ -162,41 +170,26 @@ void copy_regs(struct user_regs_struct *dst, struct user_regs_struct *src) + #undef COPY_REG + } + +-size_t get_origin_insn_len() ++size_t get_origin_insn_len(void) + { + return ORIGIN_INSN_LEN; + } + #define UPATCH_INSN_LEN 8 + #define UPATCH_ADDR_LEN 8 +-size_t get_upatch_insn_len() ++size_t get_upatch_insn_len(void) + { + return UPATCH_INSN_LEN; + } + +-size_t get_upatch_addr_len() ++size_t get_upatch_addr_len(void) + { + return UPATCH_ADDR_LEN; + } + + // for long jumper +-unsigned long get_new_insn(struct object_file *obj, unsigned long old_addr, +- unsigned long new_addr) ++unsigned long get_new_insn(void) + { + unsigned int insn0 = 0x58000051; // ldr x17, #8 + unsigned int insn4 = 0xd61f0220; // br x17 + return (unsigned long)(insn0 | ((unsigned long)insn4 << 32)); +-} +- +-#if 0 +-unsigned long get_new_insn(struct object_file *obj, unsigned long old_addr, +- unsigned long new_addr) +-{ +- unsigned char b_insn[] = { 0x00, 0x00, 0x00, 0x00 }; /* ins: b IMM */ +- +- *(unsigned int *)(b_insn) = (unsigned int)(new_addr - old_addr) / 4; +- b_insn[3] &= 0x3; +- b_insn[3] |= 0x14; +- +- return *(unsigned int *)b_insn; +-} +-#endif ++} +\ No newline at end of file +diff --git a/upatch-manage/arch/aarch64/relocation.c b/upatch-manage/arch/aarch64/relocation.c +index 0019388..3951135 100644 +--- a/upatch-manage/arch/aarch64/relocation.c ++++ b/upatch-manage/arch/aarch64/relocation.c +@@ -39,15 +39,15 @@ static inline s64 calc_reloc(enum aarch64_reloc_op op, void *place, u64 val) + switch (op) { + case RELOC_OP_ABS: + // S + A +- sval = val; ++ sval = (s64)val; + break; + case RELOC_OP_PREL: + // S + A - P +- sval = val - (u64)place; ++ sval = (s64)(val - (u64)place); + break; + case RELOC_OP_PAGE: + // Page(S + A) - Page(P) +- sval = (val & ~0xfff) - ((u64)place & ~0xfff); ++ sval = (s64)((val & ~(u64)0xfff) - ((u64)place & ~(u64)0xfff)); + break; + default: + log_error("upatch: unknown relocation operation %d\n", op); +@@ -92,7 +92,7 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + sym_name = uelf->strtab + sym->st_name; + + /* val corresponds to (S + A) */ +- val = (s64)(sym->st_value + rel[i].r_addend); ++ val = (unsigned long)sym->st_value + (unsigned long)rel[i].r_addend; + log_debug( + "upatch: reloc symbol, name=%s, k_addr=0x%lx, u_addr=0x%lx, " + "r_offset=0x%lx, st_value=0x%lx, r_addend=0x%lx \n", +@@ -113,13 +113,13 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + result = calc_reloc(RELOC_OP_ABS, uloc, val); + if (result < -(s64)BIT(31) || result >= (s64)BIT(32)) + goto overflow; +- *(s32 *)loc = result; ++ *(s32 *)loc = (s32)result; + break; + case R_AARCH64_ABS16: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + if (result < -(s64)BIT(15) || result >= (s64)BIT(16)) + goto overflow; +- *(s16 *)loc = result; ++ *(s16 *)loc = (s16)result; + break; + case R_AARCH64_PREL64: + result = calc_reloc(RELOC_OP_PREL, uloc, val); +@@ -129,13 +129,13 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + result = calc_reloc(RELOC_OP_PREL, uloc, val); + if (result < -(s64)BIT(31) || result >= (s64)BIT(32)) + goto overflow; +- *(s32 *)loc = result; ++ *(s32 *)loc = (s32)result; + break; + case R_AARCH64_PREL16: + result = calc_reloc(RELOC_OP_PREL, uloc, val); + if (result < -(s64)BIT(15) || result >= (s64)BIT(16)) + goto overflow; +- *(s16 *)loc = result; ++ *(s16 *)loc = (s16)result; + break; + /* Immediate instruction relocations. */ + case R_AARCH64_LD_PREL_LO19: +@@ -144,8 +144,8 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + goto overflow; + result = extract_insn_imm(result, 19, 2); + result = insert_insn_imm(AARCH64_INSN_IMM_19, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_ADR_PREL_LO21: + result = calc_reloc(RELOC_OP_PREL, uloc, val); +@@ -153,8 +153,8 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + goto overflow; + result = extract_insn_imm(result, 21, 0); + result = insert_insn_imm(AARCH64_INSN_IMM_ADR, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_ADR_PREL_PG_HI21: + result = calc_reloc(RELOC_OP_PAGE, uloc, val); +@@ -162,51 +162,51 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + goto overflow; + result = extract_insn_imm(result, 21, 12); + result = insert_insn_imm(AARCH64_INSN_IMM_ADR, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_ADR_PREL_PG_HI21_NC: + result = calc_reloc(RELOC_OP_PAGE, uloc, val); + result = extract_insn_imm(result, 21, 12); + result = insert_insn_imm(AARCH64_INSN_IMM_ADR, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_ADD_ABS_LO12_NC: + case R_AARCH64_LDST8_ABS_LO12_NC: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + result = extract_insn_imm(result, 12, 0); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_LDST16_ABS_LO12_NC: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + result = extract_insn_imm(result, 11, 1); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_LDST32_ABS_LO12_NC: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + result = extract_insn_imm(result, 10, 2); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_LDST64_ABS_LO12_NC: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + result = extract_insn_imm(result, 9, 3); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_LDST128_ABS_LO12_NC: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + result = extract_insn_imm(result, 8, 4); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_TSTBR14: + result = calc_reloc(RELOC_OP_PREL, uloc, val); +@@ -214,15 +214,15 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + goto overflow; + result = extract_insn_imm(result, 14, 2); + result = insert_insn_imm(AARCH64_INSN_IMM_14, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_CONDBR19: + result = calc_reloc(RELOC_OP_PREL, uloc, val); + result = extract_insn_imm(result, 19, 2); + result = insert_insn_imm(AARCH64_INSN_IMM_19, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_JUMP26: + case R_AARCH64_CALL26: +@@ -243,8 +243,8 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + } + result = extract_insn_imm(result, 26, 2); + result = insert_insn_imm(AARCH64_INSN_IMM_26, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_ADR_GOT_PAGE: + result = calc_reloc(RELOC_OP_PAGE, uloc, val); +@@ -252,8 +252,8 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + goto overflow; + result = extract_insn_imm(result, 21, 12); + result = insert_insn_imm(AARCH64_INSN_IMM_ADR, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_LD64_GOT_LO12_NC: + result = calc_reloc(RELOC_OP_ABS, uloc, val); +@@ -261,24 +261,24 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + // sometimes, result & 7 != 0, it works fine. + result = extract_insn_imm(result, 9, 3); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_TLSLE_ADD_TPREL_HI12: +- result = ALIGN(TCB_SIZE, uelf->relf->tls_align) + val; +- if (result < 0 || result >= BIT(24)) ++ result = (long)(ALIGN(TCB_SIZE, uelf->relf->tls_align) + val); ++ if (result < 0 || result >= (s64)BIT(24)) + goto overflow; + result = extract_insn_imm(result, 12, 12); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_TLSLE_ADD_TPREL_LO12_NC: +- result = ALIGN(TCB_SIZE, uelf->relf->tls_align) + val; ++ result = (long)(ALIGN(TCB_SIZE, uelf->relf->tls_align) + val); + result = extract_insn_imm(result, 12, 0); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_TLSDESC_ADR_PAGE21: + result = calc_reloc(RELOC_OP_PAGE, uloc, val); +@@ -286,23 +286,23 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + goto overflow; + result = extract_insn_imm(result, 21, 12); + result = insert_insn_imm(AARCH64_INSN_IMM_ADR, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_TLSDESC_LD64_LO12: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + // don't check result & 7 == 0. + result = extract_insn_imm(result, 9, 3); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_TLSDESC_ADD_LO12: + result = calc_reloc(RELOC_OP_ABS, uloc, val); + result = extract_insn_imm(result, 12, 0); + result = insert_insn_imm(AARCH64_INSN_IMM_12, loc, +- result); +- *(__le32 *)loc = cpu_to_le32(result); ++ (unsigned long)result); ++ *(__le32 *)loc = cpu_to_le32((__le32)result); + break; + case R_AARCH64_TLSDESC_CALL: + // this is a blr instruction, don't need to modify +diff --git a/upatch-manage/arch/x86_64/ptrace.c b/upatch-manage/arch/x86_64/ptrace.c +index d824d92..3d6dd72 100644 +--- a/upatch-manage/arch/x86_64/ptrace.c ++++ b/upatch-manage/arch/x86_64/ptrace.c +@@ -19,6 +19,7 @@ + */ + + #include ++#include + + #include + #include +@@ -26,7 +27,7 @@ + + #include "upatch-ptrace.h" + +-int upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, ++long upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, + unsigned long arg1, unsigned long arg2, + unsigned long arg3, unsigned long arg4, + unsigned long arg5, unsigned long arg6, +@@ -38,11 +39,11 @@ int upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, + 0x0f, 0x05, /* syscall */ + 0xcc, /* int3 */ + }; +- int ret; ++ long ret; + + memset(®s, 0, sizeof(struct user_regs_struct)); + log_debug("Executing syscall %d (pid %d)...\n", nr, pctx->pid); +- regs.rax = (unsigned long)nr; ++ regs.rax = (unsigned long long)nr; + regs.rdi = arg1; + regs.rsi = arg2; + regs.rdx = arg3; +@@ -57,7 +58,7 @@ int upatch_arch_syscall_remote(struct upatch_ptrace_ctx *pctx, int nr, + return ret; + } + +-int upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, ++long upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, + const unsigned char *code, size_t codelen, + struct user_regs_struct *pregs, + int (*func)(struct upatch_ptrace_ctx *pctx, +@@ -65,23 +66,30 @@ int upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, + const void *data) + { + struct user_regs_struct orig_regs, regs; +- unsigned char orig_code[codelen]; +- int ret; ++ long ret; + struct upatch_process *proc = pctx->proc; + unsigned long libc_base = proc->libc_base; + ++ unsigned char *orig_code = (unsigned char *)malloc(sizeof(*orig_code) * codelen); ++ ++ if (orig_code == NULL) { ++ log_error("Malloc orig_code failed\n"); ++ return -1; ++ } + ret = ptrace(PTRACE_GETREGS, pctx->pid, NULL, &orig_regs); + if (ret < 0) { + log_error("can't get regs - %d\n", pctx->pid); ++ free(orig_code); + return -1; + } + ret = upatch_process_mem_read(proc, libc_base, + (unsigned long *)orig_code, codelen); + if (ret < 0) { + log_error("can't peek original code - %d\n", pctx->pid); ++ free(orig_code); + return -1; + } +- ret = upatch_process_mem_write(proc, (unsigned long *)code, libc_base, ++ ret = upatch_process_mem_write(proc, code, libc_base, + codelen); + if (ret < 0) { + log_error("can't poke syscall code - %d\n", pctx->pid); +@@ -122,6 +130,7 @@ int upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, + poke_back: + upatch_process_mem_write(proc, (unsigned long *)orig_code, libc_base, + codelen); ++ free(orig_code); + return ret; + } + +@@ -165,22 +174,8 @@ size_t get_upatch_addr_len() + } + + +-unsigned long get_new_insn(struct object_file *obj, unsigned long old_addr, +- unsigned long new_addr) ++unsigned long get_new_insn(void) + { + char jmp_insn[] = { 0xff, 0x25, 0x00, 0x00, 0x00, 0x00}; + return *(unsigned long *)jmp_insn; +-} +- +-#if 0 +-unsigned long get_new_insn(struct object_file *obj, unsigned long old_addr, +- unsigned long new_addr) +-{ +- char jmp_insn[] = { 0xe9, 0x00, 0x00, 0x00, 0x00 }; /* jmp IMM */ +- +- *(unsigned int *)(jmp_insn + 1) = +- (unsigned int)(new_addr - old_addr - 5); +- +- return *(unsigned long *)jmp_insn; +-} +-#endif ++} +\ No newline at end of file +diff --git a/upatch-manage/arch/x86_64/relocation.c b/upatch-manage/arch/x86_64/relocation.c +index bb9cf32..657f014 100644 +--- a/upatch-manage/arch/x86_64/relocation.c ++++ b/upatch-manage/arch/x86_64/relocation.c +@@ -63,7 +63,7 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + (int)GELF_R_TYPE(rel[i].r_info), sym->st_value, + rel[i].r_addend, (u64)loc); + +- val = sym->st_value + rel[i].r_addend; ++ val = sym->st_value + (unsigned long)rel[i].r_addend; + switch (GELF_R_TYPE(rel[i].r_info)) { + case R_X86_64_NONE: + break; +@@ -95,7 +95,8 @@ int apply_relocate_add(struct upatch_elf *uelf, unsigned int symindex, + if (sym->st_value == 0) + goto overflow; + /* G + GOT + A*/ +- val = sym->st_value + rel[i].r_addend; ++ val = sym->st_value + (unsigned long)rel[i].r_addend; ++ /* fallthrough*/ + case R_X86_64_PC32: + case R_X86_64_PLT32: + if (*(u32 *)loc != 0) +diff --git a/upatch-manage/arch/x86_64/resolve.c b/upatch-manage/arch/x86_64/resolve.c +index 5432b20..0f8623d 100644 +--- a/upatch-manage/arch/x86_64/resolve.c ++++ b/upatch-manage/arch/x86_64/resolve.c +@@ -30,7 +30,7 @@ struct upatch_jmp_table_entry { + unsigned long addr; + }; + +-unsigned int get_jmp_table_entry() ++unsigned int get_jmp_table_entry(void) + { + return sizeof(struct upatch_jmp_table_entry); + } +@@ -84,6 +84,7 @@ unsigned long insert_plt_table(struct upatch_elf *uelf, struct object_file *obj, + unsigned long jmp_addr; + unsigned long elf_addr = 0; + ++ (void)r_type; + if (upatch_process_mem_read(obj->proc, addr, &jmp_addr, + sizeof(jmp_addr))) { + log_error("copy address failed\n"); +diff --git a/upatch-manage/upatch-common.h b/upatch-manage/upatch-common.h +index ab4084a..bc694d6 100644 +--- a/upatch-manage/upatch-common.h ++++ b/upatch-manage/upatch-common.h +@@ -33,7 +33,7 @@ + list_add(&(_new)->list, (_list)); \ + } + +-static inline int page_shift(int n) ++static inline int page_shift(long n) + { + int res = -1; + +@@ -52,7 +52,7 @@ static inline int page_shift(int n) + #endif + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #define ALIGN(x, a) (((x) + (a)-1) & (~((a)-1))) +-#define PAGE_ALIGN(x) ALIGN((x), PAGE_SIZE) ++#define PAGE_ALIGN(x) ALIGN((x), (unsigned long)PAGE_SIZE) + + #define ROUND_DOWN(x, m) ((x) & ~((m)-1)) + #define ROUND_UP(x, m) (((x) + (m)-1) & ~((m)-1)) +diff --git a/upatch-manage/upatch-elf.c b/upatch-manage/upatch-elf.c +index 78c7fd7..1038ef9 100644 +--- a/upatch-manage/upatch-elf.c ++++ b/upatch-manage/upatch-elf.c +@@ -30,14 +30,14 @@ + #include "upatch-elf.h" + #include "upatch-ptrace.h" + +-static int read_from_offset(int fd, void **buf, int len, off_t offset) ++static int read_from_offset(int fd, void **buf, unsigned long len, off_t offset) + { + *buf = malloc(len); + if (*buf == NULL) { + return -errno; + } + +- int size = pread(fd, *buf, len, offset); ++ ssize_t size = pread(fd, *buf, len, offset); + if (size == -1) { + return -errno; + } +@@ -47,7 +47,7 @@ static int read_from_offset(int fd, void **buf, int len, off_t offset) + + static int open_elf(struct elf_info *einfo, const char *name) + { +- int ret = 0, fd = -1, i; ++ int ret = 0, fd = -1; + char *sec_name; + struct stat st; + +@@ -65,7 +65,7 @@ static int open_elf(struct elf_info *einfo, const char *name) + goto out; + } + +- ret = read_from_offset(fd, (void **)&einfo->patch_buff, st.st_size, 0); ++ ret = read_from_offset(fd, (void **)&einfo->patch_buff, (unsigned long)st.st_size, 0); + if (ret != 0) { + log_error("Failed to read file '%s'\n", name); + goto out; +@@ -73,7 +73,7 @@ static int open_elf(struct elf_info *einfo, const char *name) + + einfo->name = name; + einfo->inode = st.st_ino; +- einfo->patch_size = st.st_size; ++ einfo->patch_size = (unsigned long)st.st_size; + einfo->hdr = (void *)einfo->patch_buff; + einfo->shdrs = (void *)einfo->hdr + einfo->hdr->e_shoff; + einfo->shstrtab = (void *)einfo->hdr + einfo->shdrs[einfo->hdr->e_shstrndx].sh_offset; +@@ -85,7 +85,7 @@ static int open_elf(struct elf_info *einfo, const char *name) + goto out; + } + +- for (i = 0; i < einfo->hdr->e_shnum; ++i) { ++ for (unsigned int i = 0; i < einfo->hdr->e_shnum; ++i) { + sec_name = einfo->shstrtab + einfo->shdrs[i].sh_name; + if (streql(sec_name, BUILD_ID_NAME) && einfo->shdrs[i].sh_type == SHT_NOTE) { + einfo->num_build_id = i; +@@ -116,7 +116,7 @@ int upatch_init(struct upatch_elf *uelf, const char *name) + return ret; + } + +- for (int i = 1; i < uelf->info.hdr->e_shnum; ++i) { ++ for (unsigned int i = 1; i < uelf->info.hdr->e_shnum; ++i) { + char *sec_name = uelf->info.shstrtab + uelf->info.shdrs[i].sh_name; + if (uelf->info.shdrs[i].sh_type == SHT_SYMTAB) { + uelf->num_syms = uelf->info.shdrs[i].sh_size / sizeof(GElf_Sym); +@@ -165,7 +165,7 @@ int binary_init(struct running_elf *relf, const char *name) + return ret; + } + +- for (int i = 1; i < relf->info.hdr->e_shnum; i++) { ++ for (unsigned int i = 1; i < relf->info.hdr->e_shnum; i++) { + char *sec_name = relf->info.shstrtab + relf->info.shdrs[i].sh_name; + if (relf->info.shdrs[i].sh_type == SHT_SYMTAB) { + log_debug("Found section '%s', idx=%d\n", SYMTAB_NAME, i); +diff --git a/upatch-manage/upatch-elf.h b/upatch-manage/upatch-elf.h +index 481fec9..499287a 100644 +--- a/upatch-manage/upatch-elf.h ++++ b/upatch-manage/upatch-elf.h +@@ -56,7 +56,7 @@ struct upatch_info { + unsigned long size; // upatch_info and upatch_info_func size + unsigned long start; // upatch vma start + unsigned long end; // upatch vma end +- unsigned int changed_func_num; ++ unsigned long changed_func_num; + // upatch_header_func + }; + +@@ -65,15 +65,15 @@ struct upatch_layout { + void *kbase; + void *base; + /* Total size. */ +- unsigned int size; ++ unsigned long size; + /* The size of the executable code. */ +- unsigned int text_size; ++ unsigned long text_size; + /* Size of RO section of the module (text+rodata) */ +- unsigned int ro_size; ++ unsigned long ro_size; + /* Size of RO after init section, not use it now */ +- unsigned int ro_after_init_size; ++ unsigned long ro_after_init_size; + /* The size of the info. */ +- unsigned int info_size; ++ unsigned long info_size; + }; + + struct upatch_patch_func { +diff --git a/upatch-manage/upatch-manage.c b/upatch-manage/upatch-manage.c +index 8a7ba60..965af35 100644 +--- a/upatch-manage/upatch-manage.c ++++ b/upatch-manage/upatch-manage.c +@@ -54,14 +54,14 @@ struct arguments { + }; + + static struct argp_option options[] = { +- { "verbose", 'v', NULL, 0, "Show verbose output" }, +- { "uuid", 'U', "uuid", 0, "the uuid of the upatch" }, +- { "pid", 'p', "pid", 0, "the pid of the user-space process" }, +- { "upatch", 'u', "upatch", 0, "the upatch file" }, +- { "binary", 'b', "binary", 0, "the binary file" }, +- { "cmd", 0, "patch", 0, "Apply a upatch file to a user-space process" }, ++ { "verbose", 'v', NULL, 0, "Show verbose output", 0 }, ++ { "uuid", 'U', "uuid", 0, "the uuid of the upatch", 0 }, ++ { "pid", 'p', "pid", 0, "the pid of the user-space process", 0 }, ++ { "upatch", 'u', "upatch", 0, "the upatch file", 0 }, ++ { "binary", 'b', "binary", 0, "the binary file", 0 }, ++ { "cmd", 0, "patch", 0, "Apply a upatch file to a user-space process", 0 }, + { "cmd", 0, "unpatch", 0, +- "Unapply a upatch file to a user-space process" }, ++ "Unapply a upatch file to a user-space process", 0 }, + { NULL } + }; + +@@ -135,7 +135,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) + return 0; + } + +-static struct argp argp = { options, parse_opt, args_doc, program_doc }; ++static struct argp argp = { options, parse_opt, args_doc, program_doc, NULL, NULL, NULL }; + + int patch_upatch(const char *uuid, const char *binary_path, const char *upatch_path, int pid) + { +@@ -163,7 +163,7 @@ out: + return ret; + } + +-int unpatch_upatch(const char *uuid, const char *binary_path, const char *upatch_path, int pid) ++int unpatch_upatch(const char *uuid, int pid) + { + int ret = 0; + +@@ -176,7 +176,7 @@ int unpatch_upatch(const char *uuid, const char *binary_path, const char *upatch + return 0; + } + +-int info_upatch(const char *binary_path, const char *upatch_path, int pid) ++int info_upatch(int pid) + { + int ret = process_info(pid); + if (ret != 0) { +@@ -210,10 +210,10 @@ int main(int argc, char *argv[]) + ret = patch_upatch(args.uuid, args.binary, args.upatch, args.pid); + break; + case UNPATCH: +- ret = unpatch_upatch(args.uuid, args.binary, args.upatch, args.pid); ++ ret = unpatch_upatch(args.uuid, args.pid); + break; + case INFO: +- ret = info_upatch(args.binary, args.upatch, args.pid); ++ ret = info_upatch(args.pid); + break; + default: + ERROR("Unknown command"); +diff --git a/upatch-manage/upatch-patch.c b/upatch-manage/upatch-patch.c +index ab972ac..cbdbbe1 100644 +--- a/upatch-manage/upatch-patch.c ++++ b/upatch-manage/upatch-patch.c +@@ -51,7 +51,7 @@ static GElf_Off calculate_load_address(struct running_elf *relf, + bool check_code) + { + int i; +- GElf_Off min_addr = -1; ++ GElf_Off min_addr = (unsigned long)-1; + + /* TODO: for ET_DYN, consider check PIE */ + if (relf->info.hdr->e_type != ET_EXEC && +@@ -78,7 +78,7 @@ out: + static unsigned long calculate_mem_load(struct object_file *obj) + { + struct obj_vm_area *ovma; +- unsigned long load_addr = -1; ++ unsigned long load_addr = (unsigned long)-1; + + list_for_each_entry(ovma, &obj->vma, list) { + if (ovma->inmem.prot & PROT_EXEC) { +@@ -120,29 +120,20 @@ static int rewrite_section_headers(struct upatch_elf *uelf) + return 0; + } + +-/* Additional bytes needed by arch in front of individual sections */ +-unsigned int arch_mod_section_prepend(struct upatch_elf *uelf, +- unsigned int section) ++static unsigned long get_offset(unsigned long *size, ++ GElf_Shdr *sechdr) + { +- /* default implementation just returns zero */ +- return 0; +-} ++ unsigned long ret; + +-static long get_offset(struct upatch_elf *uelf, unsigned int *size, +- GElf_Shdr *sechdr, unsigned int section) +-{ +- long ret; +- +- *size += arch_mod_section_prepend(uelf, section); +- ret = ALIGN(*size, sechdr->sh_addralign ?: 1); +- *size = ret + sechdr->sh_size; ++ ret = ALIGN(*size, (unsigned long)(sechdr->sh_addralign ?: 1)); ++ *size = (unsigned long)ret + sechdr->sh_size; + return ret; + } + + static void layout_upatch_info(struct upatch_elf *uelf) + { + GElf_Shdr *upatch_func = uelf->info.shdrs + uelf->index.upatch_funcs; +- int num = upatch_func->sh_size / sizeof(struct upatch_patch_func); ++ unsigned long num = upatch_func->sh_size / sizeof(struct upatch_patch_func); + + uelf->core_layout.info_size = uelf->core_layout.size; + uelf->core_layout.size += sizeof(struct upatch_info) + +@@ -189,7 +180,7 @@ static void layout_sections(struct upatch_elf *uelf) + continue; + + s->sh_entsize = +- get_offset(uelf, &uelf->core_layout.size, s, i); ++ get_offset(&uelf->core_layout.size, s); + log_debug("\tm = %d; %s: sh_entsize: 0x%lx\n", m, sname, + s->sh_entsize); + } +@@ -214,13 +205,14 @@ static void layout_sections(struct upatch_elf *uelf) + uelf->core_layout.size = + PAGE_ALIGN(uelf->core_layout.size); + break; ++ default: ++ break; + } + } + } + + /* TODO: only included used symbol */ +-static bool is_upatch_symbol(const GElf_Sym *src, const GElf_Shdr *sechdrs, +- unsigned int shnum) ++static bool is_upatch_symbol(void) + { + return true; + } +@@ -237,12 +229,11 @@ static void layout_symtab(struct upatch_elf *uelf) + GElf_Shdr *strsect = uelf->info.shdrs + uelf->index.str; + /* TODO: only support same arch as kernel now */ + const GElf_Sym *src; +- unsigned int i, nsrc, ndst, strtab_size = 0; ++ unsigned long i, nsrc, ndst, strtab_size = 0; + + /* Put symbol section at end of init part of module. */ + symsect->sh_flags |= SHF_ALLOC; +- symsect->sh_entsize = get_offset(uelf, &uelf->core_layout.size, symsect, +- uelf->index.sym); ++ symsect->sh_entsize = get_offset(&uelf->core_layout.size, symsect); + log_debug("\t%s\n", uelf->info.shstrtab + symsect->sh_name); + + src = (void *)uelf->info.hdr + symsect->sh_offset; +@@ -250,8 +241,7 @@ static void layout_symtab(struct upatch_elf *uelf) + + /* Compute total space required for the symbols' strtab. */ + for (ndst = i = 0; i < nsrc; i++) { +- if (i == 0 || is_upatch_symbol(src + i, uelf->info.shdrs, +- uelf->info.hdr->e_shnum)) { ++ if (i == 0 || is_upatch_symbol()) { + strtab_size += + strlen(&uelf->strtab[src[i].st_name]) + 1; + ndst++; +@@ -270,8 +260,7 @@ static void layout_symtab(struct upatch_elf *uelf) + + /* Put string table section at end of init part of module. */ + strsect->sh_flags |= SHF_ALLOC; +- strsect->sh_entsize = get_offset(uelf, &uelf->core_layout.size, strsect, +- uelf->index.str); ++ strsect->sh_entsize = get_offset(&uelf->core_layout.size, strsect); + uelf->core_layout.size = PAGE_ALIGN(uelf->core_layout.size); + log_debug("\t%s\n", uelf->info.shstrtab + strsect->sh_name); + } +@@ -288,8 +277,8 @@ static void *upatch_alloc(struct object_file *obj, size_t sz) + + addr = upatch_mmap_remote(proc2pctx(obj->proc), addr, sz, + PROT_READ | PROT_WRITE | PROT_EXEC, +- MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, +- 0); ++ MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, ++ (unsigned long)-1, 0); + if (addr == 0) { + return NULL; + } +@@ -308,7 +297,7 @@ static void *upatch_alloc(struct object_file *obj, size_t sz) + } + + static void upatch_free(struct object_file *obj, void *base, +- unsigned int size) ++ unsigned long size) + { + log_debug("Free patch memory %p\n", base); + if (upatch_munmap_remote(proc2pctx(obj->proc), (unsigned long)base, size)) { +@@ -378,7 +367,7 @@ static int post_memory(struct upatch_elf *uelf, struct object_file *obj) + { + int ret = 0; + +- log_debug("Post kbase %lx(%x) to base %lx\n", ++ log_debug("Post kbase %lx(%lx) to base %lx\n", + (unsigned long)uelf->core_layout.kbase, + uelf->core_layout.size, + (unsigned long)uelf->core_layout.base); +@@ -396,7 +385,7 @@ out: + + static int complete_info(struct upatch_elf *uelf, struct object_file *obj, const char *uuid) + { +- int ret = 0, i; ++ int ret = 0; + struct upatch_info *uinfo = + (void *)uelf->core_layout.kbase + uelf->core_layout.info_size; + struct upatch_patch_func *upatch_funcs_addr = +@@ -414,7 +403,7 @@ static int complete_info(struct upatch_elf *uelf, struct object_file *obj, const + memcpy(uinfo->id, uuid, strlen(uuid)); + + log_normal("Changed insn:\n"); +- for (i = 0; i < uinfo->changed_func_num; ++i) { ++ for (unsigned int i = 0; i < uinfo->changed_func_num; ++i) { + struct upatch_info_func *upatch_func = + (void *)uelf->core_layout.kbase + + uelf->core_layout.info_size + +@@ -433,8 +422,7 @@ static int complete_info(struct upatch_elf *uelf, struct object_file *obj, const + goto out; + } + +- upatch_func->new_insn = get_new_insn(obj, upatch_func->old_addr, +- upatch_func->new_addr); ++ upatch_func->new_insn = get_new_insn(); + + log_normal("\t0x%lx(0x%lx -> 0x%lx)\n", upatch_func->old_addr, + upatch_func->old_insn[0], upatch_func->new_insn); +@@ -446,10 +434,10 @@ out: + + static int unapply_patch(struct object_file *obj, + struct upatch_info_func *funcs, +- unsigned int changed_func_num) ++ unsigned long changed_func_num) + { + log_normal("Changed insn:\n"); +- for (int i = 0; i < changed_func_num; ++i) { ++ for (unsigned int i = 0; i < changed_func_num; ++i) { + log_normal("\t0x%lx(0x%lx -> 0x%lx)\n", funcs[i].old_addr, + funcs[i].new_insn, funcs[i].old_insn[0]); + +@@ -467,7 +455,8 @@ static int unapply_patch(struct object_file *obj, + + static int apply_patch(struct upatch_elf *uelf, struct object_file *obj) + { +- int ret = 0, i; ++ int ret = 0; ++ unsigned int i; + struct upatch_info *uinfo = + (void *)uelf->core_layout.kbase + uelf->core_layout.info_size; + +@@ -617,10 +606,10 @@ static int upatch_apply_patches(struct upatch_process *proc, + layout_symtab(uelf); + layout_upatch_info(uelf); + +- log_debug("calculate core layout = %x\n", uelf->core_layout.size); ++ log_debug("calculate core layout = %lx\n", uelf->core_layout.size); + log_debug( +- "Core layout: text_size = %x, ro_size = %x, ro_after_init_size = " +- "%x, info = %x, size = %x\n", ++ "Core layout: text_size = %lx, ro_size = %lx, ro_after_init_size = " ++ "%lx, info = %lx, size = %lx\n", + uelf->core_layout.text_size, uelf->core_layout.ro_size, + uelf->core_layout.ro_after_init_size, + uelf->core_layout.info_size, uelf->core_layout.size); +@@ -699,7 +688,7 @@ static void upatch_time_tick(int pid) { + return; + } + +- unsigned long frozen_time = GET_MICROSECONDS(end_tv, start_tv); ++ long frozen_time = GET_MICROSECONDS(end_tv, start_tv); + log_normal("Process %d frozen time is %ld microsecond(s)\n", + pid, frozen_time); + } +@@ -751,7 +740,7 @@ int process_patch(int pid, struct upatch_elf *uelf, struct running_elf *relf, co + * stored in the patch are valid for the original object. + */ + // 解析process的mem-maps，获得各个块的内存映射以及phdr +- ret = upatch_process_map_object_files(&proc, NULL); ++ ret = upatch_process_map_object_files(&proc); + if (ret < 0) { + log_error("Failed to read process memory mapping\n"); + goto out_free; +@@ -871,7 +860,7 @@ int process_unpatch(int pid, const char *uuid) + * stored in the patch are valid for the original object. + */ + // 解析process的mem-maps，获得各个块的内存映射以及phdr +- ret = upatch_process_map_object_files(&proc, NULL); ++ ret = upatch_process_map_object_files(&proc); + if (ret < 0) { + log_error("Failed to read process memory mapping\n"); + goto out_free; +@@ -950,7 +939,7 @@ int process_info(int pid) + goto out_free; + } + +- ret = upatch_process_map_object_files(&proc, NULL); ++ ret = upatch_process_map_object_files(&proc); + if (ret < 0) { + log_error("Failed to read process memory mapping\n"); + goto out_free; +diff --git a/upatch-manage/upatch-process.c b/upatch-manage/upatch-process.c +index c368165..3b8db3b 100644 +--- a/upatch-manage/upatch-process.c ++++ b/upatch-manage/upatch-process.c +@@ -65,7 +65,7 @@ static int lock_process(int pid) + return fd; + } + +-static void unlock_process(int pid, int fdmaps) ++static void unlock_process(int fdmaps) + { + int errsv = errno; + close(fdmaps); +@@ -141,7 +141,7 @@ int upatch_process_init(struct upatch_process *proc, int pid) + return 0; + + out_unlock: +- unlock_process(pid, fdmaps); ++ unlock_process(fdmaps); + out_err: + return -1; + } +@@ -192,7 +192,7 @@ static void upatch_process_memfree(struct upatch_process *proc) + + void upatch_process_destroy(struct upatch_process *proc) + { +- unlock_process(proc->pid, proc->fdmaps); ++ unlock_process(proc->fdmaps); + upatch_process_memfree(proc); + } + +@@ -345,12 +345,12 @@ static int object_add_vm_area(struct object_file *o, struct vm_area *vma, + } + + static struct object_file * +-process_new_object(struct upatch_process *proc, dev_t dev, int inode, ++process_new_object(struct upatch_process *proc, dev_t dev, ino_t inode, + const char *name, struct vm_area *vma, struct vm_hole *hole) + { + struct object_file *o; + +- log_debug("Creating object file '%s' for %lx:%d...", name, dev, inode); ++ log_debug("Creating object file '%s' for %lx:%lu...", name, dev, inode); + + o = malloc(sizeof(*o)); + if (!o) { +@@ -389,7 +389,7 @@ process_new_object(struct upatch_process *proc, dev_t dev, int inode, + * Returns: 0 if everything is ok, -1 on error. + */ + static int process_add_object_vma(struct upatch_process *proc, dev_t dev, +- int inode, char *name, struct vm_area *vma, ++ ino_t inode, char *name, struct vm_area *vma, + struct vm_hole *hole) + { + int object_type; +@@ -407,7 +407,7 @@ static int process_add_object_vma(struct upatch_process *proc, dev_t dev, + */ + list_for_each_entry_reverse(o, &proc->objs, list) { + if ((dev && inode && o->dev == dev && +- o->inode == inode) || ++ o->inode == (ino_t)inode) || + (dev == 0 && !strcmp(o->name, name))) { + return object_add_vm_area(o, vma, hole); + } +@@ -512,9 +512,9 @@ int upatch_process_parse_proc_maps(struct upatch_process *proc) + vma.prot = perms2prot(perms); + + /* Hole must be at least 2 pages for guardians */ +- if (start - hole_start > 2 * PAGE_SIZE) { +- hole = process_add_vm_hole(proc, hole_start + PAGE_SIZE, +- start - PAGE_SIZE); ++ if (start - hole_start > (unsigned long)(2 * PAGE_SIZE)) { ++ hole = process_add_vm_hole(proc, hole_start + (unsigned long)PAGE_SIZE, ++ start - (unsigned long)PAGE_SIZE); + if (hole == NULL) { + log_error("Failed to add vma hole"); + goto error; +@@ -557,8 +557,7 @@ error: + return -1; + } + +-int upatch_process_map_object_files(struct upatch_process *proc, +- const char *patch_id) ++int upatch_process_map_object_files(struct upatch_process *proc) + { + // we can get plt/got table from mem's elf_segments + // Now we read them from the running file +@@ -618,7 +617,7 @@ static int process_list_threads(struct upatch_process *proc, int **ppids, + + *ppids = pids; + +- return *npids; ++ return (int)*npids; + + dealloc: + if (dir) { +@@ -761,8 +760,10 @@ static inline unsigned long hole_size(struct vm_hole *hole) + int vm_hole_split(struct vm_hole *hole, unsigned long alloc_start, + unsigned long alloc_end) + { +- alloc_start = ROUND_DOWN(alloc_start, PAGE_SIZE) - PAGE_SIZE; +- alloc_end = ROUND_UP(alloc_end, PAGE_SIZE) + PAGE_SIZE; ++ unsigned long page_size = (unsigned long)PAGE_SIZE; ++ ++ alloc_start = ROUND_DOWN(alloc_start, page_size) - page_size; ++ alloc_end = ROUND_UP(alloc_end, page_size) + page_size; + + if (alloc_start > hole->start) { + struct vm_hole *left = NULL; +@@ -856,7 +857,7 @@ unsigned long object_find_patch_region(struct object_file *obj, size_t memsize, + return -1UL; + } + +- region_start = (region_start >> PAGE_SHIFT) << PAGE_SHIFT; ++ region_start = (region_start >> (unsigned long)PAGE_SHIFT) << (unsigned long)PAGE_SHIFT; + log_debug("Found patch region for '%s' at 0x%lx\n", obj->name, + region_start); + +diff --git a/upatch-manage/upatch-process.h b/upatch-manage/upatch-process.h +index 39909db..be44cb5 100644 +--- a/upatch-manage/upatch-process.h ++++ b/upatch-manage/upatch-process.h +@@ -133,7 +133,7 @@ void upatch_process_print_short(struct upatch_process *); + + int upatch_process_mem_open(struct upatch_process *, int); + +-int upatch_process_map_object_files(struct upatch_process *, const char *); ++int upatch_process_map_object_files(struct upatch_process *); + + int upatch_process_attach(struct upatch_process *); + +diff --git a/upatch-manage/upatch-ptrace.c b/upatch-manage/upatch-ptrace.c +index 1309a6e..03296bc 100644 +--- a/upatch-manage/upatch-ptrace.c ++++ b/upatch-manage/upatch-ptrace.c +@@ -37,16 +37,16 @@ int upatch_process_mem_read(struct upatch_process *proc, unsigned long src, + { + ssize_t r = pread(proc->memfd, dst, size, (off_t)src); + +- return r != size ? -1 : 0; ++ return r != (ssize_t)size ? -1 : 0; + } + + static int upatch_process_mem_write_ptrace(struct upatch_process *proc, +- void *src, unsigned long dst, size_t size) ++ const void *src, unsigned long dst, size_t size) + { +- int ret; ++ long ret; + + while (ROUND_DOWN(size, sizeof(long)) != 0) { +- ret = ptrace(PTRACE_POKEDATA, proc->pid, dst, *(unsigned long *)src); ++ ret = ptrace(PTRACE_POKEDATA, proc->pid, dst, *(const unsigned long *)src); + if (ret) { + return -1; + } +@@ -56,10 +56,10 @@ static int upatch_process_mem_write_ptrace(struct upatch_process *proc, + } + + if (size) { +- unsigned long tmp; ++ long tmp; + + tmp = ptrace(PTRACE_PEEKDATA, proc->pid, dst, NULL); +- if (tmp == (unsigned long)-1 && errno) { ++ if (tmp == -1 && errno) { + return -1; + } + memcpy(&tmp, src, size); +@@ -73,7 +73,7 @@ static int upatch_process_mem_write_ptrace(struct upatch_process *proc, + return 0; + } + +-int upatch_process_mem_write(struct upatch_process *proc, void *src, ++int upatch_process_mem_write(struct upatch_process *proc, const void *src, + unsigned long dst, size_t size) + { + static int use_pwrite = 1; +@@ -87,7 +87,7 @@ int upatch_process_mem_write(struct upatch_process *proc, void *src, + return upatch_process_mem_write_ptrace(proc, src, dst, size); + } + +- return w != size ? -1 : 0; ++ return w != (ssize_t)size ? -1 : 0; + } + + static struct upatch_ptrace_ctx* upatch_ptrace_ctx_alloc( +@@ -168,19 +168,20 @@ int upatch_ptrace_attach_thread(struct upatch_process *proc, int tid) + + int wait_for_stop(struct upatch_ptrace_ctx *pctx, const void *data) + { +- int ret, status = 0, pid = (int)(uintptr_t)data ?: pctx->pid; ++ long ret; ++ int status = 0, pid = (int)(uintptr_t)data ?: pctx->pid; + log_debug("wait_for_stop(pctx->pid=%d, pid=%d)\n", pctx->pid, pid); + + while (1) { + ret = ptrace(PTRACE_CONT, pctx->pid, NULL, (void *)(uintptr_t)status); + if (ret < 0) { +- log_error("Cannot start tracee %d, ret=%d\n", pctx->pid, ret); ++ log_error("Cannot start tracee %d, ret=%ld\n", pctx->pid, ret); + return -1; + } + + ret = waitpid(pid, &status, __WALL); + if (ret < 0) { +- log_error("Cannot wait tracee %d, ret=%d\n", pid, ret); ++ log_error("Cannot wait tracee %d, ret=%ld\n", pid, ret); + return -1; + } + +@@ -217,7 +218,7 @@ int upatch_ptrace_detach(struct upatch_ptrace_ctx *pctx) + return 0; + } + +-int upatch_execute_remote(struct upatch_ptrace_ctx *pctx, ++long upatch_execute_remote(struct upatch_ptrace_ctx *pctx, + const unsigned char *code, size_t codelen, + struct user_regs_struct *pregs) + { +@@ -226,13 +227,13 @@ int upatch_execute_remote(struct upatch_ptrace_ctx *pctx, + } + + unsigned long upatch_mmap_remote(struct upatch_ptrace_ctx *pctx, +- unsigned long addr, size_t length, int prot, +- int flags, int fd, off_t offset) ++ unsigned long addr, size_t length, unsigned long prot, ++ unsigned long flags, unsigned long fd, unsigned long offset) + { +- int ret; ++ long ret; + unsigned long res = 0; + +- log_debug("mmap_remote: 0x%lx+%lx, %x, %x, %d, %lx\n", addr, length, ++ log_debug("mmap_remote: 0x%lx+%lx, %lx, %lx, %lu, %lx\n", addr, length, + prot, flags, fd, offset); + ret = upatch_arch_syscall_remote(pctx, __NR_mmap, (unsigned long)addr, + length, prot, flags, fd, offset, &res); +@@ -240,16 +241,16 @@ unsigned long upatch_mmap_remote(struct upatch_ptrace_ctx *pctx, + return 0; + } + if (ret == 0 && res >= (unsigned long)-MAX_ERRNO) { +- errno = -(long)res; ++ errno = -(int)res; + return 0; + } + return res; + } + + int upatch_mprotect_remote(struct upatch_ptrace_ctx *pctx, unsigned long addr, +- size_t length, int prot) ++ size_t length, unsigned long prot) + { +- int ret; ++ long ret; + unsigned long res; + + log_debug("mprotect_remote: 0x%lx+%lx\n", addr, length); +@@ -259,7 +260,7 @@ int upatch_mprotect_remote(struct upatch_ptrace_ctx *pctx, unsigned long addr, + if (ret < 0) + return -1; + if (ret == 0 && res >= (unsigned long)-MAX_ERRNO) { +- errno = -(long)res; ++ errno = -(int)res; + return -1; + } + +@@ -269,7 +270,7 @@ int upatch_mprotect_remote(struct upatch_ptrace_ctx *pctx, unsigned long addr, + int upatch_munmap_remote(struct upatch_ptrace_ctx *pctx, unsigned long addr, + size_t length) + { +- int ret; ++ long ret; + unsigned long res; + + log_debug("munmap_remote: 0x%lx+%lx\n", addr, length); +@@ -278,7 +279,7 @@ int upatch_munmap_remote(struct upatch_ptrace_ctx *pctx, unsigned long addr, + if (ret < 0) + return -1; + if (ret == 0 && res >= (unsigned long)-MAX_ERRNO) { +- errno = -(long)res; ++ errno = -(int)res; + return -1; + } + return 0; +diff --git a/upatch-manage/upatch-ptrace.h b/upatch-manage/upatch-ptrace.h +index 0c88434..b88c656 100644 +--- a/upatch-manage/upatch-ptrace.h ++++ b/upatch-manage/upatch-ptrace.h +@@ -43,7 +43,7 @@ struct upatch_ptrace_ctx { + int upatch_process_mem_read(struct upatch_process *proc, unsigned long src, + void *dst, size_t size); + +-int upatch_process_mem_write(struct upatch_process *, void *, unsigned long, ++int upatch_process_mem_write(struct upatch_process *, const void *, unsigned long, + size_t); + + int upatch_ptrace_attach_thread(struct upatch_process *, int); +@@ -54,31 +54,32 @@ int wait_for_stop(struct upatch_ptrace_ctx *, const void *); + + void copy_regs(struct user_regs_struct *, struct user_regs_struct *); + +-int upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, ++long upatch_arch_execute_remote_func(struct upatch_ptrace_ctx *pctx, + const unsigned char *code, size_t codelen, + struct user_regs_struct *pregs, + int (*func)(struct upatch_ptrace_ctx *pctx, + const void *data), + const void *data); + +-int upatch_arch_syscall_remote(struct upatch_ptrace_ctx *, int, unsigned long, ++long upatch_arch_syscall_remote(struct upatch_ptrace_ctx *, int, unsigned long, + unsigned long, unsigned long, unsigned long, + unsigned long, unsigned long, unsigned long *); + +-unsigned long upatch_mmap_remote(struct upatch_ptrace_ctx *, unsigned long, +- size_t, int, int, int, off_t); ++unsigned long upatch_mmap_remote(struct upatch_ptrace_ctx *pctx, ++ unsigned long addr, size_t length, unsigned long prot, ++ unsigned long flags, unsigned long fd, unsigned long offset); + +-int upatch_mprotect_remote(struct upatch_ptrace_ctx *, unsigned long, size_t, +- int); ++int upatch_mprotect_remote(struct upatch_ptrace_ctx *pctx, unsigned long addr, ++ size_t length, unsigned long prot); + + int upatch_munmap_remote(struct upatch_ptrace_ctx *, unsigned long, size_t); + +-int upatch_execute_remote(struct upatch_ptrace_ctx *, const unsigned char *, ++long upatch_execute_remote(struct upatch_ptrace_ctx *, const unsigned char *, + size_t, struct user_regs_struct *); + +-size_t get_origin_insn_len(); +-size_t get_upatch_insn_len(); +-size_t get_upatch_addr_len(); +-unsigned long get_new_insn(struct object_file *, unsigned long, unsigned long); ++size_t get_origin_insn_len(void); ++size_t get_upatch_insn_len(void); ++size_t get_upatch_addr_len(void); ++unsigned long get_new_insn(void); + + #endif +diff --git a/upatch-manage/upatch-resolve.c b/upatch-manage/upatch-resolve.c +index 0e992da..197ea2f 100644 +--- a/upatch-manage/upatch-resolve.c ++++ b/upatch-manage/upatch-resolve.c +@@ -50,7 +50,7 @@ static unsigned long resolve_rela_dyn(struct upatch_elf *uelf, + * some rela don't have the symbol index, use the symbol's value and + * rela's addend to find the symbol. for example, R_X86_64_IRELATIVE. + */ +- if (rela_dyn[i].r_addend != patch_sym->st_value) { ++ if (rela_dyn[i].r_addend != (long)patch_sym->st_value) { + continue; + } + } +@@ -110,7 +110,7 @@ static unsigned long resolve_rela_plt(struct upatch_elf *uelf, + * some rela don't have the symbol index, use the symbol's value and + * rela's addend to find the symbol. for example, R_X86_64_IRELATIVE. + */ +- if (rela_plt[i].r_addend != patch_sym->st_value) { ++ if (rela_plt[i].r_addend != (long)patch_sym->st_value) { + continue; + } + } else { +@@ -140,7 +140,7 @@ static unsigned long resolve_rela_plt(struct upatch_elf *uelf, + } + + static unsigned long resolve_dynsym(struct upatch_elf *uelf, +- struct object_file *obj, const char *name, GElf_Sym *patch_sym) ++ struct object_file *obj, const char *name) + { + unsigned long elf_addr = 0; + struct running_elf *relf = uelf->relf; +@@ -178,8 +178,7 @@ static unsigned long resolve_dynsym(struct upatch_elf *uelf, + return elf_addr; + } + +-static unsigned long resolve_sym(struct upatch_elf *uelf, +- struct object_file *obj, const char *name, GElf_Sym *patch_sym) ++static unsigned long resolve_sym(struct upatch_elf *uelf, const char *name) + { + unsigned long elf_addr = 0; + struct running_elf *relf = uelf->relf; +@@ -217,7 +216,7 @@ static unsigned long resolve_sym(struct upatch_elf *uelf, + } + + static unsigned long resolve_patch_sym(struct upatch_elf *uelf, +- struct object_file *obj, const char *name, GElf_Sym *patch_sym) ++ const char *name, GElf_Sym *patch_sym) + { + unsigned long elf_addr = 0; + struct running_elf *relf = uelf->relf; +@@ -265,17 +264,17 @@ static unsigned long resolve_symbol(struct upatch_elf *uelf, + + /* resolve from dynsym */ + if (!elf_addr) { +- elf_addr = resolve_dynsym(uelf, obj, name, &patch_sym); ++ elf_addr = resolve_dynsym(uelf, obj, name); + } + + /* resolve from sym */ + if (!elf_addr) { +- elf_addr = resolve_sym(uelf, obj, name, &patch_sym); ++ elf_addr = resolve_sym(uelf, name); + } + + /* resolve from patch sym */ + if (!elf_addr) { +- elf_addr = resolve_patch_sym(uelf, obj, name, &patch_sym); ++ elf_addr = resolve_patch_sym(uelf, name, &patch_sym); + } + + if (!elf_addr) { +diff --git a/upatch-manage/upatch-resolve.h b/upatch-manage/upatch-resolve.h +index 324c49e..9b31dce 100644 +--- a/upatch-manage/upatch-resolve.h ++++ b/upatch-manage/upatch-resolve.h +@@ -29,7 +29,7 @@ + /* jmp table, solve limit for the jmp instruction, Used for both PLT/GOT */ + struct upatch_jmp_table_entry; + +-unsigned int get_jmp_table_entry(); ++unsigned int get_jmp_table_entry(void); + + unsigned long insert_plt_table(struct upatch_elf *, struct object_file *, + unsigned long, unsigned long); +-- +2.34.1 + diff --git a/0029-common-fix-failed-to-set-selinux-status-issue.patch b/0029-common-fix-failed-to-set-selinux-status-issue.patch new file mode 100644 index 0000000..d56e749 --- /dev/null +++ b/0029-common-fix-failed-to-set-selinux-status-issue.patch @@ -0,0 +1,32 @@ +From f913658fd6746bb59df82e0c564b664592e71c87 Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Wed, 5 Jun 2024 10:52:44 +0800 +Subject: [PATCH] common: fix 'failed to set selinux status' issue + +Signed-off-by: liuxiaobo +--- + syscare-common/src/os/selinux.rs | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/syscare-common/src/os/selinux.rs b/syscare-common/src/os/selinux.rs +index cf3b5b2..bb9864c 100644 +--- a/syscare-common/src/os/selinux.rs ++++ b/syscare-common/src/os/selinux.rs +@@ -59,7 +59,13 @@ pub fn set_status(value: Status) -> Result<()> { + if (value != Status::Permissive) && (value != Status::Enforcing) { + bail!("Status {} is invalid", value); + } +- fs::write(SELINUX_SYS_FILE, value.to_string())?; ++ fs::write( ++ SELINUX_SYS_FILE, ++ match value { ++ Status::Enforcing => "1", ++ _ => "0", ++ }, ++ )?; + + Ok(()) + } +-- +2.34.1 + diff --git a/0030-upatch-diff-exit-with-error-when-any-tls-var-include.patch b/0030-upatch-diff-exit-with-error-when-any-tls-var-include.patch new file mode 100644 index 0000000..33c63a0 --- /dev/null +++ b/0030-upatch-diff-exit-with-error-when-any-tls-var-include.patch @@ -0,0 +1,48 @@ +From 7e17420b259d6a25425230cd1cc25bfaf602f1df Mon Sep 17 00:00:00 2001 +From: ningyu +Date: Mon, 27 May 2024 10:34:00 +0000 +Subject: [PATCH] upatch-diff: exit with error when any tls var included + +Signed-off-by: ningyu +--- + upatch-diff/create-diff-object.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/upatch-diff/create-diff-object.c b/upatch-diff/create-diff-object.c +index 6474b22..5ec6f31 100644 +--- a/upatch-diff/create-diff-object.c ++++ b/upatch-diff/create-diff-object.c +@@ -847,6 +847,19 @@ static void include_debug_sections(struct upatch_elf *uelf) + /* currently, there si no special section need to be handled */ + static void process_special_sections(void) {} + ++static bool has_tls_included(struct upatch_elf *uelf) ++{ ++ struct symbol *sym; ++ ++ list_for_each_entry(sym, &uelf->symbols, list) { ++ if (sym->include == 1 && sym->type == STT_TLS) { ++ log_normal("TLS symbol '%s' included, but it's not supported", sym->name); ++ return true; ++ } ++ } ++ return false; ++} ++ + static void verify_patchability(struct upatch_elf *uelf) + { + struct section *sec; +@@ -878,6 +891,10 @@ static void verify_patchability(struct upatch_elf *uelf) + + if (errs) + DIFF_FATAL("%d, Unsupported section changes", errs); ++ ++ if (has_tls_included(uelf)) { ++ DIFF_FATAL("Unsupported symbol included"); ++ } + } + + static void migrate_included_elements(struct upatch_elf *uelf_patched, struct upatch_elf *uelf_out) +-- +2.34.1 + diff --git a/0031-upatch-diff-fix-lookup_relf-duplicate-failure.patch b/0031-upatch-diff-fix-lookup_relf-duplicate-failure.patch new file mode 100644 index 0000000..0733b9f --- /dev/null +++ b/0031-upatch-diff-fix-lookup_relf-duplicate-failure.patch @@ -0,0 +1,34 @@ +From 8a12d289a01988ec7e2de11ff7f697f63ef74987 Mon Sep 17 00:00:00 2001 +From: ningyu +Date: Mon, 27 May 2024 11:16:26 +0000 +Subject: [PATCH] upatch-diff: fix lookup_relf duplicate failure + +Signed-off-by: ningyu +--- + upatch-diff/running-elf.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/upatch-diff/running-elf.c b/upatch-diff/running-elf.c +index 25b72b7..18ff095 100644 +--- a/upatch-diff/running-elf.c ++++ b/upatch-diff/running-elf.c +@@ -125,9 +125,15 @@ bool lookup_relf(struct running_elf *relf, + symbol = &relf->obj_syms[i]; + sympos++; + +- if (strcmp(symbol->name, lookup_sym->name) != 0) { ++ if (result->symbol != NULL && symbol->type == STT_FILE) { ++ break; ++ } ++ ++ if (strcmp(symbol->name, lookup_sym->name) != 0 || ++ symbol->bind != lookup_sym->bind) { + continue; + } ++ + if ((result->symbol != NULL) && + (result->symbol->bind == symbol->bind)) { + ERROR("Found duplicate symbol '%s' in %s", +-- +2.34.1 + diff --git a/0032-upatch-diff-fix-memory-leak.patch b/0032-upatch-diff-fix-memory-leak.patch new file mode 100644 index 0000000..68d65a2 --- /dev/null +++ b/0032-upatch-diff-fix-memory-leak.patch @@ -0,0 +1,611 @@ +From e6eef4077acbff6e43e3c3880fb57d64b73e2567 Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Thu, 27 Jun 2024 14:22:53 +0800 +Subject: [PATCH] upatch-diff: fix memory leak + +Signed-off-by: liuxiaobo +--- + upatch-diff/create-diff-object.c | 34 +++++--- + upatch-diff/elf-correlate.c | 10 +-- + upatch-diff/elf-create.c | 83 ++++++++++++-------- + upatch-diff/elf-debug.c | 7 +- + upatch-diff/running-elf.c | 2 +- + upatch-diff/running-elf.h | 2 +- + upatch-diff/upatch-elf.c | 128 ++++++++++++++++++++++--------- + upatch-diff/upatch-elf.h | 14 +++- + 8 files changed, 191 insertions(+), 89 deletions(-) + +diff --git a/upatch-diff/create-diff-object.c b/upatch-diff/create-diff-object.c +index 5ec6f31..8830956 100644 +--- a/upatch-diff/create-diff-object.c ++++ b/upatch-diff/create-diff-object.c +@@ -836,8 +836,10 @@ static void include_debug_sections(struct upatch_elf *uelf) + + list_for_each_entry_safe(rela, saferela, &sec->relas, list) + // The shndex of symbol is SHN_COMMON, there is no related section +- if (rela->sym && !rela->sym->include) ++ if (rela->sym && !rela->sym->include) { + list_del(&rela->list); ++ free(rela); ++ } + } + + if (eh_sec) +@@ -993,15 +995,20 @@ int main(int argc, char*argv[]) + mark_ignored_functions_same(); + mark_ignored_sections_same(); + +- upatch_elf_teardown(&uelf_source); +- upatch_elf_free(&uelf_source); +- + include_standard_elements(&uelf_patched); + + num_changed = include_changed_functions(&uelf_patched); + new_globals_exist = include_new_globals(&uelf_patched); + if (!num_changed && !new_globals_exist) { + log_normal("No functional changes\n"); ++ upatch_elf_destroy(&uelf_source); ++ upatch_elf_destroy(&uelf_patched); ++ ++ upatch_elf_close(&uelf_source); ++ upatch_elf_close(&uelf_patched); ++ ++ relf_close(&relf); ++ + return 0; + } + +@@ -1019,9 +1026,6 @@ int main(int argc, char*argv[]) + + migrate_included_elements(&uelf_patched, &uelf_out); + +- /* since out elf still point to it, we only destroy it, not free it */ +- upatch_elf_teardown(&uelf_patched); +- + upatch_create_strings_elements(&uelf_out); + + upatch_create_patches_sections(&uelf_out, &relf); +@@ -1060,11 +1064,19 @@ int main(int argc, char*argv[]) + + upatch_write_output_elf(&uelf_out, uelf_patched.elf, arguments.output_obj, 0664); + +- relf_destroy(&relf); +- upatch_elf_free(&uelf_patched); +- upatch_elf_teardown(&uelf_out); +- upatch_elf_free(&uelf_out); ++ upatch_elf_destroy(&uelf_source); ++ upatch_elf_destroy(&uelf_patched); ++ upatch_elf_destroy(&uelf_out); ++ ++ upatch_elf_close(&uelf_source); ++ upatch_elf_close(&uelf_patched); ++ upatch_elf_close(&uelf_out); ++ ++ relf_close(&relf); + + log_normal("Done\n"); ++ fflush(stdout); ++ fflush(stderr); ++ + return 0; + } +diff --git a/upatch-diff/elf-correlate.c b/upatch-diff/elf-correlate.c +index 3e3a536..cc3b925 100644 +--- a/upatch-diff/elf-correlate.c ++++ b/upatch-diff/elf-correlate.c +@@ -36,9 +36,8 @@ static void correlate_symbol(struct symbol *sym_orig, struct symbol *sym_patched + sym_orig->status = sym_patched->status = SAME; + if (strcmp(sym_orig->name, sym_patched->name)) { + log_debug("renaming symbol %s to %s \n", sym_patched->name, sym_orig->name); +- sym_patched->name = strdup(sym_orig->name); +- if (!sym_patched->name) +- ERROR("strdup"); ++ sym_patched->name = sym_orig->name; ++ sym_patched->name_source = DATA_SOURCE_REF; + } + if (sym_orig->relf_sym && !sym_patched->relf_sym) + sym_patched->relf_sym = sym_orig->relf_sym; +@@ -98,9 +97,8 @@ static void __correlate_section(struct section *sec_orig, struct section *sec_pa + /* Make sure these two sections have the same name */ + if (strcmp(sec_orig->name, sec_patched->name)) { + log_debug("renaming section %s to %s \n", sec_patched->name, sec_orig->name); +- sec_patched->name = strdup(sec_orig->name); +- if (!sec_patched->name) +- ERROR("strdup"); ++ sec_patched->name = sec_orig->name; ++ sec_patched->name_source = DATA_SOURCE_REF; + } + } + +diff --git a/upatch-diff/elf-create.c b/upatch-diff/elf-create.c +index 8ac212a..bd7edf0 100644 +--- a/upatch-diff/elf-create.c ++++ b/upatch-diff/elf-create.c +@@ -41,10 +41,12 @@ static struct section *create_section_pair(struct upatch_elf *uelf, char *name, + { + char *relaname; + struct section *sec, *relasec; ++ size_t size = strlen(name) + strlen(".rela") + 1; + +- relaname = malloc(strlen(name) + strlen(".rela") + 1); +- if (!relaname) ++ relaname = calloc(1, size); ++ if (!relaname) { + ERROR("relaname malloc failed."); ++ } + + strcpy(relaname, ".rela"); + strcat(relaname, name); +@@ -52,13 +54,17 @@ static struct section *create_section_pair(struct upatch_elf *uelf, char *name, + /* allocate text section resourcce */ + ALLOC_LINK(sec, &uelf->sections); + sec->name = name; +- sec->data = malloc(sizeof(*sec->data)); +- if (!sec->data) ++ sec->data = calloc(1, sizeof(Elf_Data)); ++ if (!sec->data) { + ERROR("section data malloc failed."); ++ } ++ sec->data_source = DATA_SOURCE_ALLOC; + + sec->data->d_buf = calloc(nr, entsize); +- if (!sec->data->d_buf) ++ if (!sec->data->d_buf) { + ERROR("d_buf of section data malloc failed."); ++ } ++ sec->dbuf_source = DATA_SOURCE_ALLOC; + + sec->data->d_size = entsize * nr; + sec->data->d_type = ELF_T_BYTE; +@@ -73,12 +79,15 @@ static struct section *create_section_pair(struct upatch_elf *uelf, char *name, + /* set relocation section */ + ALLOC_LINK(relasec, &uelf->sections); + relasec->name = relaname; ++ relasec->name_source = DATA_SOURCE_ALLOC; + INIT_LIST_HEAD(&relasec->relas); + + /* buffers will be generated by upatch_rebuild_rela_section_data */ +- relasec->data = malloc(sizeof(*relasec->data)); +- if (!relasec->data) ++ relasec->data = calloc(1, sizeof(Elf_Data)); ++ if (!relasec->data) { + ERROR("relasec data malloc failed."); ++ } ++ relasec->data_source = DATA_SOURCE_ALLOC; + + relasec->data->d_type = ELF_T_RELA; + +@@ -103,9 +112,12 @@ void upatch_create_strings_elements(struct upatch_elf *uelf) + ALLOC_LINK(sec, &uelf->sections); + sec->name = ".upatch.strings"; + +- sec->data = malloc(sizeof(*sec->data)); +- if (!sec->data) ++ sec->data = calloc(1, sizeof(Elf_Data)); ++ if (!sec->data) { + ERROR("section data malloc failed"); ++ } ++ sec->data_source = DATA_SOURCE_ALLOC; ++ + sec->data->d_type = ELF_T_BYTE; + + /* set section header */ +@@ -310,12 +322,14 @@ void upatch_build_strings_section_data(struct upatch_elf *uelf) + size += strlen(string->name) + 1; + + /* allocate section resources */ +- strtab = malloc(size); +- if (!strtab) ++ strtab = calloc(1, size); ++ if (!strtab) { + ERROR("strtab malloc failed."); ++ } + + sec->data->d_buf = strtab; + sec->data->d_size = size; ++ sec->dbuf_source = DATA_SOURCE_ALLOC; + + /* populate strings section data */ + list_for_each_entry(string, &uelf->strings, list) { +@@ -407,13 +421,15 @@ static void rebuild_rela_section_data(struct section *sec) + nr++; + + size = nr * sizeof(*relas); +- relas = malloc(size); +- if (!relas) ++ relas = calloc(1, size); ++ if (!relas) { + ERROR("relas malloc failed."); ++ } + + sec->data->d_buf = relas; + sec->data->d_size = size; + sec->sh.sh_size = size; ++ sec->dbuf_source = DATA_SOURCE_ALLOC; + + list_for_each_entry(rela, &sec->relas, list) { + relas[index].r_offset = rela->offset; +@@ -469,18 +485,19 @@ void upatch_create_shstrtab(struct upatch_elf *uelf) + char *buf; + + shstrtab = find_section_by_name(&uelf->sections, ".shstrtab"); +- if (!shstrtab) ++ if (!shstrtab) { + ERROR("find_section_by_name failed."); ++ } + + /* determine size of string table */ + size = 1; + list_for_each_entry(sec, &uelf->sections, list) + size += strlen(sec->name) + 1; + +- buf = malloc(size); +- if (!buf) ++ buf = calloc(1, size); ++ if (!buf) { + ERROR("malloc shstrtab failed."); +- memset(buf, 0, size); ++ } + + offset = 1; + list_for_each_entry(sec, &uelf->sections, list) { +@@ -490,11 +507,14 @@ void upatch_create_shstrtab(struct upatch_elf *uelf) + offset += len; + } + +- if (offset != size) ++ if (offset != size) { ++ free(buf); + ERROR("shstrtab size mismatch."); ++ } + + shstrtab->data->d_buf = buf; + shstrtab->data->d_size = size; ++ shstrtab->dbuf_source = DATA_SOURCE_ALLOC; + + log_debug("shstrtab: "); + print_strtab(buf, size); +@@ -506,25 +526,24 @@ void upatch_create_shstrtab(struct upatch_elf *uelf) + + void upatch_create_strtab(struct upatch_elf *uelf) + { +- struct section *strtab; +- struct symbol *sym; + size_t size = 0, offset = 0, len = 0; +- char *buf; + +- strtab = find_section_by_name(&uelf->sections, ".strtab"); +- if (!strtab) ++ struct section *strtab = find_section_by_name(&uelf->sections, ".strtab"); ++ if (!strtab) { + ERROR("find section failed in create strtab."); ++ } + ++ struct symbol *sym = NULL; + list_for_each_entry(sym, &uelf->symbols, list) { + if (sym->type == STT_SECTION) + continue; + size += strlen(sym->name) + 1; + } + +- buf = malloc(size); +- if (!buf) ++ char *buf = calloc(1, size); ++ if (!buf) { + ERROR("malloc buf failed in create strtab"); +- memset(buf, 0, size); ++ } + + list_for_each_entry(sym, &uelf->symbols, list) { + if (sym->type == STT_SECTION) { +@@ -537,11 +556,14 @@ void upatch_create_strtab(struct upatch_elf *uelf) + offset += len; + } + +- if (offset != size) ++ if (offset != size) { ++ free(buf); + ERROR("shstrtab size mismatch."); ++ } + + strtab->data->d_buf = buf; + strtab->data->d_size = size; ++ strtab->dbuf_source = DATA_SOURCE_ALLOC; + + log_debug("strtab: "); + print_strtab(buf, size); +@@ -569,10 +591,10 @@ void upatch_create_symtab(struct upatch_elf *uelf) + nr++; + + size = nr * symtab->sh.sh_entsize; +- buf = malloc(size); +- if (!buf) ++ buf = calloc(1, size); ++ if (!buf) { + ERROR("malloc buf failed in create symtab."); +- memset(buf, 0, size); ++ } + + offset = 0; + list_for_each_entry(sym, &uelf->symbols, list) { +@@ -585,6 +607,7 @@ void upatch_create_symtab(struct upatch_elf *uelf) + + symtab->data->d_buf = buf; + symtab->data->d_size = size; ++ symtab->dbuf_source = DATA_SOURCE_ALLOC; + + /* update symtab section header */ + strtab = find_section_by_name(&uelf->sections, ".strtab"); +diff --git a/upatch-diff/elf-debug.c b/upatch-diff/elf-debug.c +index eaabfa1..0490f86 100644 +--- a/upatch-diff/elf-debug.c ++++ b/upatch-diff/elf-debug.c +@@ -129,9 +129,10 @@ void upatch_rebuild_eh_frame(struct section *sec) + + /* in this time, some relcation entries may have been deleted */ + frame_size = 0; +- eh_frame = malloc(sec->data->d_size); +- if (!eh_frame) ++ eh_frame = calloc(1, sec->data->d_size); ++ if (!eh_frame) { + ERROR("malloc eh_frame failed \n"); ++ } + + /* 8 is the offset of PC begin */ + current_offset = 8; +@@ -191,5 +192,7 @@ void upatch_rebuild_eh_frame(struct section *sec) + + sec->data->d_buf = eh_frame; + sec->data->d_size = frame_size; ++ sec->dbuf_source = DATA_SOURCE_ALLOC; ++ + sec->sh.sh_size = frame_size; + } +diff --git a/upatch-diff/running-elf.c b/upatch-diff/running-elf.c +index 18ff095..c99b395 100644 +--- a/upatch-diff/running-elf.c ++++ b/upatch-diff/running-elf.c +@@ -101,7 +101,7 @@ void relf_init(char *elf_name, struct running_elf *relf) + } + } + +-int relf_destroy(struct running_elf *relf) ++int relf_close(struct running_elf *relf) + { + free(relf->obj_syms); + elf_end(relf->elf); +diff --git a/upatch-diff/running-elf.h b/upatch-diff/running-elf.h +index 0646780..b02c8e2 100644 +--- a/upatch-diff/running-elf.h ++++ b/upatch-diff/running-elf.h +@@ -58,7 +58,7 @@ struct running_elf { + + void relf_init(char *, struct running_elf *); + +-int relf_destroy(struct running_elf *); ++int relf_close(struct running_elf *); + + bool lookup_relf(struct running_elf *, struct symbol *, struct lookup_result *); + +diff --git a/upatch-diff/upatch-elf.c b/upatch-diff/upatch-elf.c +index ee38efc..171e88e 100644 +--- a/upatch-diff/upatch-elf.c ++++ b/upatch-diff/upatch-elf.c +@@ -67,11 +67,14 @@ static void create_section_list(struct upatch_elf *uelf) + sec->name = elf_strptr(uelf->elf, shstrndx, sec->sh.sh_name); + if (!sec->name) + ERROR("elf_strptr with error %s", elf_errmsg(0)); +- + sec->data = elf_getdata(scn, NULL); + if (!sec->data) + ERROR("elf_getdata with error %s", elf_errmsg(0)); + ++ sec->name_source = DATA_SOURCE_ELF; ++ sec->data_source = DATA_SOURCE_ELF; ++ sec->dbuf_source = DATA_SOURCE_ELF; ++ + sec->index = (unsigned int)elf_ndxscn(scn); + /* found extended section header */ + if (sec->sh.sh_type == SHT_SYMTAB_SHNDX) +@@ -157,6 +160,8 @@ static void create_rela_list(struct upatch_elf *uelf, struct section *relasec) + struct rela *rela; + int index = 0, skip = 0; + ++ INIT_LIST_HEAD(&relasec->relas); ++ + /* for relocation sections, sh_info is the index which these informations apply */ + relasec->base = find_section_by_index(&uelf->sections, relasec->sh.sh_info); + if (!relasec->base) +@@ -215,10 +220,86 @@ static void create_rela_list(struct upatch_elf *uelf, struct section *relasec) + } + } + ++static void destroy_rela_list(struct section *relasec) ++{ ++ struct rela *rela = NULL, *saferela = NULL; ++ ++ list_for_each_entry_safe(rela, saferela, &relasec->relas, list) { ++ list_del(&rela->list); ++ free(rela); ++ } ++ ++ INIT_LIST_HEAD(&relasec->relas); ++} ++ ++static void destroy_section_list(struct upatch_elf *uelf) ++{ ++ struct section *sec = NULL, *safesec = NULL; ++ ++ list_for_each_entry_safe(sec, safesec, &uelf->sections, list) { ++ if (sec->twin) { ++ sec->twin->twin = NULL; ++ } ++ ++ if ((sec->name != NULL) && (sec->name_source == DATA_SOURCE_ALLOC)) { ++ free(sec->name); ++ sec->name = NULL; ++ } ++ ++ if (sec->data != NULL) { ++ if (sec->dbuf_source == DATA_SOURCE_ALLOC) { ++ free(sec->data->d_buf); ++ sec->data->d_buf = NULL; ++ } ++ if (sec->data_source == DATA_SOURCE_ALLOC) { ++ free(sec->data); ++ sec->data = NULL; ++ } ++ } ++ ++ if (is_rela_section(sec)) { ++ destroy_rela_list(sec); ++ } ++ ++ list_del(&sec->list); ++ free(sec); ++ } ++ ++ INIT_LIST_HEAD(&uelf->sections); ++} ++ ++static void destroy_symbol_list(struct upatch_elf *uelf) ++{ ++ struct symbol *sym = NULL, *safesym = NULL; ++ ++ list_for_each_entry_safe(sym, safesym, &uelf->symbols, list) { ++ if (sym->twin) { ++ sym->twin->twin = NULL; ++ } ++ ++ list_del(&sym->list); ++ free(sym); ++ } ++ ++ INIT_LIST_HEAD(&uelf->symbols); ++} ++ ++static void destroy_string_list(struct upatch_elf *uelf) ++{ ++ struct string *str = NULL, *safestr = NULL; ++ ++ list_for_each_entry_safe(str, safestr, &uelf->strings, list) { ++ list_del(&str->list); ++ free(str); ++ } ++ ++ INIT_LIST_HEAD(&uelf->strings); ++} ++ + void upatch_elf_open(struct upatch_elf *uelf, const char *name) + { + GElf_Ehdr ehdr; +- struct section *relasec; ++ struct section *sec; + Elf *elf = NULL; + int fd = 1; + +@@ -264,46 +345,21 @@ void upatch_elf_open(struct upatch_elf *uelf, const char *name) + create_section_list(uelf); + create_symbol_list(uelf); + +- list_for_each_entry(relasec, &uelf->sections, list) { +- if (!is_rela_section(relasec)) +- continue; +- INIT_LIST_HEAD(&relasec->relas); +- +- create_rela_list(uelf, relasec); +- } +-} +- +-void upatch_elf_teardown(struct upatch_elf *uelf) +-{ +- struct section *sec, *safesec; +- struct symbol *sym, *safesym; +- struct rela *rela, *saferela; +- +- list_for_each_entry_safe(sec, safesec, &uelf->sections, list) { +- if (sec->twin) +- sec->twin->twin = NULL; ++ list_for_each_entry(sec, &uelf->sections, list) { + if (is_rela_section(sec)) { +- list_for_each_entry_safe(rela, saferela, &sec->relas, list) { +- memset(rela, 0, sizeof(*rela)); +- free(rela); +- } ++ create_rela_list(uelf, sec); + } +- memset(sec, 0, sizeof(*sec)); +- free(sec); +- } +- +- list_for_each_entry_safe(sym, safesym, &uelf->symbols, list) { +- if (sym->twin) +- sym->twin->twin = NULL; +- memset(sym, 0, sizeof(*sym)); +- free(sym); + } ++} + +- INIT_LIST_HEAD(&uelf->sections); +- INIT_LIST_HEAD(&uelf->symbols); ++void upatch_elf_destroy(struct upatch_elf *uelf) ++{ ++ destroy_section_list(uelf); ++ destroy_symbol_list(uelf); ++ destroy_string_list(uelf); + } + +-void upatch_elf_free(struct upatch_elf *uelf) ++void upatch_elf_close(struct upatch_elf *uelf) + { + elf_end(uelf->elf); + close(uelf->fd); +diff --git a/upatch-diff/upatch-elf.h b/upatch-diff/upatch-elf.h +index 3cbb59b..6c62c93 100644 +--- a/upatch-diff/upatch-elf.h ++++ b/upatch-diff/upatch-elf.h +@@ -39,6 +39,12 @@ struct section; + struct rela; + struct symbol; + ++enum data_source { ++ DATA_SOURCE_ELF, ++ DATA_SOURCE_REF, ++ DATA_SOURCE_ALLOC, ++}; ++ + enum status { + NEW, + CHANGED, +@@ -61,6 +67,9 @@ struct section { + struct section *twin; + char *name; + Elf_Data *data; ++ enum data_source name_source; ++ enum data_source data_source; ++ enum data_source dbuf_source; + GElf_Shdr sh; + int ignore; + int include; +@@ -102,6 +111,7 @@ struct symbol { + struct section *sec; + GElf_Sym sym; + char *name; ++ enum data_source name_source; + struct debug_symbol *relf_sym; + unsigned int index; + unsigned char bind; +@@ -132,8 +142,8 @@ struct upatch_elf { + void upatch_elf_open(struct upatch_elf *, const char *); + + // Destory upatch_elf struct +-void upatch_elf_teardown(struct upatch_elf *); ++void upatch_elf_destroy(struct upatch_elf *); + +-void upatch_elf_free(struct upatch_elf *); ++void upatch_elf_close(struct upatch_elf *); + + #endif +-- +2.34.1 + diff --git a/0033-upatch-hijacker-fix-memory-leak.patch b/0033-upatch-hijacker-fix-memory-leak.patch new file mode 100644 index 0000000..680ac47 --- /dev/null +++ b/0033-upatch-hijacker-fix-memory-leak.patch @@ -0,0 +1,43 @@ +From a1fa8c08a6605339ac9cb5d9101f4f24c7430f62 Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Thu, 27 Jun 2024 16:22:26 +0800 +Subject: [PATCH] upatch-hijacker: fix memory leak + +Signed-off-by: liuxiaobo +--- + upatch-hijacker/hijacker/gnu-as-hijacker.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/upatch-hijacker/hijacker/gnu-as-hijacker.c b/upatch-hijacker/hijacker/gnu-as-hijacker.c +index 860a84f..886420e 100644 +--- a/upatch-hijacker/hijacker/gnu-as-hijacker.c ++++ b/upatch-hijacker/hijacker/gnu-as-hijacker.c +@@ -48,6 +48,7 @@ int main(int argc, char *argv[], char *envp[]) + { + // Try to get executable path + const char *filename = get_current_exec(); ++ + if (filename == NULL) { + return -ENOENT; + } +@@ -111,9 +112,15 @@ int main(int argc, char *argv[], char *envp[]) + (void)unlink(output_file); + } + ++ int ret = 0; + if (symlink(new_output_file, output_file) != 0) { +- return execve(filename, argv, envp); ++ ret = execve(filename, argv, envp); ++ goto out; + } + +- return execve(filename, (char* const*)new_argv, envp); ++ ret = execve(filename, (char* const*)new_argv, envp); ++out: ++ free(new_argv); ++ ++ return ret; + } +-- +2.34.1 + diff --git a/0034-upatch-manage-fix-memory-leak.patch b/0034-upatch-manage-fix-memory-leak.patch new file mode 100644 index 0000000..2fb3426 --- /dev/null +++ b/0034-upatch-manage-fix-memory-leak.patch @@ -0,0 +1,113 @@ +From 93a0c2c9d1ad383758b595fa551b43366d82d047 Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Thu, 27 Jun 2024 16:22:02 +0800 +Subject: [PATCH] upatch-manage: fix memory leak + +Signed-off-by: liuxiaobo +--- + upatch-manage/arch/x86_64/ptrace.c | 7 ++-- + upatch-manage/upatch-process.c | 61 ++++++++++++++++++------------ + 2 files changed, 39 insertions(+), 29 deletions(-) + +diff --git a/upatch-manage/arch/x86_64/ptrace.c b/upatch-manage/arch/x86_64/ptrace.c +index 3d6dd72..95e2710 100644 +--- a/upatch-manage/arch/x86_64/ptrace.c ++++ b/upatch-manage/arch/x86_64/ptrace.c +@@ -173,9 +173,8 @@ size_t get_upatch_addr_len() + return UPATCH_ADDR_LEN; + } + +- + unsigned long get_new_insn(void) + { +- char jmp_insn[] = { 0xff, 0x25, 0x00, 0x00, 0x00, 0x00}; +- return *(unsigned long *)jmp_insn; +-} +\ No newline at end of file ++ // ASM: jmp word ptr [di] (FF25 0000 0000 0000) ++ return 0x25FF; ++} +diff --git a/upatch-manage/upatch-process.c b/upatch-manage/upatch-process.c +index 3b8db3b..84ec030 100644 +--- a/upatch-manage/upatch-process.c ++++ b/upatch-manage/upatch-process.c +@@ -385,6 +385,40 @@ process_new_object(struct upatch_process *proc, dev_t dev, ino_t inode, + return o; + } + ++static int add_upatch_object(struct upatch_process *proc, ++ struct object_file *o, unsigned long src, unsigned char *header_buf) ++{ ++ struct object_patch *opatch; ++ ++ opatch = malloc(sizeof(struct object_patch)); ++ if (opatch == NULL) { ++ log_error("malloc opatch failed\n"); ++ return -1; ++ } ++ ++ opatch->uinfo = malloc(sizeof(struct upatch_info)); ++ if (opatch->uinfo == NULL) { ++ log_error("malloc opatch->uinfo failed\n"); ++ free(opatch); ++ return -1; ++ } ++ ++ memcpy(opatch->uinfo, header_buf, sizeof(struct upatch_info)); ++ opatch->funcs = malloc(opatch->uinfo->changed_func_num * ++ sizeof(struct upatch_info_func)); ++ if (upatch_process_mem_read(proc, src, opatch->funcs, ++ opatch->uinfo->changed_func_num * sizeof(struct upatch_info_func))) { ++ log_error("can't read patch funcs at 0x%lx\n", src); ++ free(opatch->uinfo); ++ free(opatch); ++ return -1; ++ } ++ list_add(&opatch->list, &o->applied_patch); ++ o->num_applied_patch++; ++ o->is_patch = 1; ++ ++ return 0; ++} + /** + * Returns: 0 if everything is ok, -1 on error. + */ +@@ -420,33 +454,10 @@ static int process_add_object_vma(struct upatch_process *proc, dev_t dev, + } + + if (object_type == OBJECT_UPATCH) { +- struct object_patch *opatch; +- +- opatch = malloc(sizeof(struct object_patch)); +- if (opatch == NULL) { +- return -1; +- } +- +- opatch->uinfo = malloc(sizeof(struct upatch_info)); +- if (opatch->uinfo == NULL) { +- return -1; +- } +- +- memcpy(opatch->uinfo, header_buf, sizeof(struct upatch_info)); +- opatch->funcs = malloc(opatch->uinfo->changed_func_num * +- sizeof(struct upatch_info_func)); +- if (upatch_process_mem_read( +- proc, vma->start + sizeof(struct upatch_info), +- opatch->funcs, +- opatch->uinfo->changed_func_num * +- sizeof(struct upatch_info_func))) { +- log_error("can't read patch funcs at 0x%lx\n", +- vma->start + sizeof(struct upatch_info)); ++ unsigned long src = vma->start + sizeof(struct upatch_info); ++ if (add_upatch_object(proc, o, src, header_buf) != 0) { + return -1; + } +- list_add(&opatch->list, &o->applied_patch); +- o->num_applied_patch++; +- o->is_patch = 1; + } + if (object_type == OBJECT_ELF) { + o->is_elf = 1; +-- +2.34.1 + diff --git a/0035-security-sanitize-sensitive-code.patch b/0035-security-sanitize-sensitive-code.patch new file mode 100644 index 0000000..cbb8453 --- /dev/null +++ b/0035-security-sanitize-sensitive-code.patch @@ -0,0 +1,1989 @@ +From 3dffc94e5bf110785c9fe96dc96f16dba10c8ac8 Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Fri, 7 Jun 2024 16:25:53 +0800 +Subject: [PATCH] security: sanitize sensitive code + +1. rename 'upatch_hijacker' to 'upatch_helper' +2. sanitize all 'hijacker' in source code + +Signed-off-by: liuxiaobo +--- + CMakeLists.txt | 2 +- + upatch-build/src/{hijacker.rs => helper.rs} | 31 ++++--- + upatch-build/src/main.rs | 11 +-- + upatch-build/src/project.rs | 2 +- + upatch-build/src/rpc/proxy.rs | 4 +- + .../CMakeLists.txt | 2 +- + upatch-helper/helper/CMakeLists.txt | 35 ++++++++ + .../helper/gnu-as-helper.c | 18 ++-- + .../helper/gnu-compiler-helper.c | 16 ++-- + .../helper/helper.h | 12 +-- + upatch-helper/ko/CMakeLists.txt | 32 +++++++ + {upatch-hijacker => upatch-helper}/ko/LICENSE | 0 + .../ko/Makefile | 2 +- + {upatch-hijacker => upatch-helper}/ko/cache.c | 4 +- + {upatch-hijacker => upatch-helper}/ko/cache.h | 8 +- + .../ko/context.c | 60 ++++++------- + .../ko/context.h | 16 ++-- + {upatch-hijacker => upatch-helper}/ko/ioctl.c | 82 ++++++++--------- + {upatch-hijacker => upatch-helper}/ko/ioctl.h | 22 ++--- + {upatch-hijacker => upatch-helper}/ko/log.h | 8 +- + {upatch-hijacker => upatch-helper}/ko/main.c | 12 +-- + {upatch-hijacker => upatch-helper}/ko/map.c | 2 +- + {upatch-hijacker => upatch-helper}/ko/map.h | 8 +- + .../ko/records.c | 12 +-- + .../ko/records.h | 16 ++-- + .../ko/uprobe.c | 16 ++-- + .../ko/uprobe.h | 8 +- + {upatch-hijacker => upatch-helper}/ko/utils.h | 8 +- + upatch-hijacker/hijacker/CMakeLists.txt | 35 -------- + upatch-hijacker/ko/CMakeLists.txt | 32 ------- + upatch-manage/upatch-patch.c | 4 +- + upatchd/src/config.rs | 4 +- + upatchd/src/{hijacker => helper}/config.rs | 24 ++--- + .../src/{hijacker => helper}/elf_resolver.rs | 0 + upatchd/src/{hijacker => helper}/ioctl.rs | 28 +++--- + upatchd/src/{hijacker => helper}/kmod.rs | 8 +- + upatchd/src/{hijacker => helper}/mod.rs | 87 ++++++++++--------- + upatchd/src/main.rs | 4 +- + upatchd/src/rpc/skeleton.rs | 8 +- + upatchd/src/rpc/skeleton_impl.rs | 30 +++---- + 40 files changed, 359 insertions(+), 354 deletions(-) + rename upatch-build/src/{hijacker.rs => helper.rs} (69%) + rename {upatch-hijacker => upatch-helper}/CMakeLists.txt (81%) + create mode 100644 upatch-helper/helper/CMakeLists.txt + rename upatch-hijacker/hijacker/gnu-as-hijacker.c => upatch-helper/helper/gnu-as-helper.c (89%) + rename upatch-hijacker/hijacker/gnu-compiler-hijacker.c => upatch-helper/helper/gnu-compiler-helper.c (85%) + rename upatch-hijacker/hijacker/hijacker.h => upatch-helper/helper/helper.h (83%) + create mode 100644 upatch-helper/ko/CMakeLists.txt + rename {upatch-hijacker => upatch-helper}/ko/LICENSE (100%) + rename {upatch-hijacker => upatch-helper}/ko/Makefile (94%) + rename {upatch-hijacker => upatch-helper}/ko/cache.c (94%) + rename {upatch-hijacker => upatch-helper}/ko/cache.h (86%) + rename {upatch-hijacker => upatch-helper}/ko/context.c (70%) + rename {upatch-hijacker => upatch-helper}/ko/context.h (73%) + rename {upatch-hijacker => upatch-helper}/ko/ioctl.c (64%) + rename {upatch-hijacker => upatch-helper}/ko/ioctl.h (69%) + rename {upatch-hijacker => upatch-helper}/ko/log.h (87%) + rename {upatch-hijacker => upatch-helper}/ko/main.c (86%) + rename {upatch-hijacker => upatch-helper}/ko/map.c (99%) + rename {upatch-hijacker => upatch-helper}/ko/map.h (90%) + rename {upatch-hijacker => upatch-helper}/ko/records.c (90%) + rename {upatch-hijacker => upatch-helper}/ko/records.h (80%) + rename {upatch-hijacker => upatch-helper}/ko/uprobe.c (89%) + rename {upatch-hijacker => upatch-helper}/ko/uprobe.h (86%) + rename {upatch-hijacker => upatch-helper}/ko/utils.h (90%) + delete mode 100644 upatch-hijacker/hijacker/CMakeLists.txt + delete mode 100644 upatch-hijacker/ko/CMakeLists.txt + rename upatchd/src/{hijacker => helper}/config.rs (70%) + rename upatchd/src/{hijacker => helper}/elf_resolver.rs (100%) + rename upatchd/src/{hijacker => helper}/ioctl.rs (80%) + rename upatchd/src/{hijacker => helper}/kmod.rs (95%) + rename upatchd/src/{hijacker => helper}/mod.rs (52%) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4858ba5..659222f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,7 +66,7 @@ set(CMAKE_EXE_LINKER_FLAGS "${LINK_FLAGS}") + # Subdirectories + add_subdirectory(upatch-diff) + add_subdirectory(upatch-manage) +-add_subdirectory(upatch-hijacker) ++add_subdirectory(upatch-helper) + add_subdirectory(misc) + + # Build rust executables +diff --git a/upatch-build/src/hijacker.rs b/upatch-build/src/helper.rs +similarity index 69% +rename from upatch-build/src/hijacker.rs +rename to upatch-build/src/helper.rs +index 3060495..7ce3323 100644 +--- a/upatch-build/src/hijacker.rs ++++ b/upatch-build/src/helper.rs +@@ -9,13 +9,13 @@ use crate::rpc::{RpcRemote, UpatchProxy}; + + const UPATCHD_SOCKET_NAME: &str = "upatchd.sock"; + +-pub struct Hijacker<'a> { ++pub struct UpatchHelper<'a> { + proxy: UpatchProxy, + programs: IndexSet<&'a Path>, + finished: Vec<&'a Path>, + } + +-impl<'a> Hijacker<'a> { ++impl<'a> UpatchHelper<'a> { + pub fn new(compilers: I, work_dir: P) -> Result + where + I: IntoIterator, +@@ -36,20 +36,20 @@ impl<'a> Hijacker<'a> { + programs, + finished: vec![], + }; +- instance.hijack()?; ++ instance.enable()?; + + Ok(instance) + } + } + +-impl Hijacker<'_> { +- fn hijack(&mut self) -> Result<()> { +- info!("Hijacking compiler(s)"); ++impl UpatchHelper<'_> { ++ fn enable(&mut self) -> Result<()> { ++ info!("Hooking compiler(s)"); + for exec_path in &self.programs { + info!("- {}", exec_path.display()); + self.proxy +- .enable_hijack(exec_path) +- .with_context(|| format!("Failed to hijack {}", exec_path.display()))?; ++ .hook_compiler(exec_path) ++ .with_context(|| format!("Failed to hook compiler {}", exec_path.display()))?; + + self.finished.push(exec_path); + } +@@ -57,14 +57,13 @@ impl Hijacker<'_> { + Ok(()) + } + +- fn unhack(&mut self) { +- info!("Releasing compiler(s)"); ++ fn disable(&mut self) { ++ info!("Unhooking compiler(s)"); + while let Some(exec_path) = self.finished.pop() { + info!("- {}", exec_path.display()); +- let result = self +- .proxy +- .disable_hijack(exec_path) +- .with_context(|| format!("Failed to release {}", exec_path.display())); ++ let result = self.proxy.unhook_compiler(exec_path).with_context(|| { ++ format!("Failed to unhook compiler helper {}", exec_path.display()) ++ }); + + if let Err(e) = result { + error!("{:?}", e); +@@ -73,8 +72,8 @@ impl Hijacker<'_> { + } + } + +-impl Drop for Hijacker<'_> { ++impl Drop for UpatchHelper<'_> { + fn drop(&mut self) { +- self.unhack() ++ self.disable() + } + } +diff --git a/upatch-build/src/main.rs b/upatch-build/src/main.rs +index 473b0a7..769cc6c 100644 +--- a/upatch-build/src/main.rs ++++ b/upatch-build/src/main.rs +@@ -36,7 +36,7 @@ mod compiler; + mod dwarf; + mod elf; + mod file_relation; +-mod hijacker; ++mod helper; + mod pattern_path; + mod project; + mod resolve; +@@ -47,7 +47,7 @@ use build_root::BuildRoot; + use compiler::Compiler; + use dwarf::Dwarf; + use file_relation::FileRelation; +-use hijacker::Hijacker; ++use helper::UpatchHelper; + use project::Project; + + const CLI_NAME: &str = "upatch build"; +@@ -401,7 +401,8 @@ impl UpatchBuild { + } + + let mut files = FileRelation::new(); +- let hijacker = Hijacker::new(&compilers, work_dir).context("Failed to hack compilers")?; ++ let upatch_helper = ++ UpatchHelper::new(&compilers, work_dir).context("Failed to hook compilers")?; + + info!("Preparing {}", project); + project +@@ -435,8 +436,8 @@ impl UpatchBuild { + info!("Collecting file relations"); + files.collect_patched_build(object_dir, patched_dir)?; + +- // Unhack compilers +- drop(hijacker); ++ // Restore compilers ++ drop(upatch_helper); + + let build_info = BuildInfo { + linker, +diff --git a/upatch-build/src/project.rs b/upatch-build/src/project.rs +index b36c26b..8b2a7b6 100644 +--- a/upatch-build/src/project.rs ++++ b/upatch-build/src/project.rs +@@ -28,7 +28,7 @@ use syscare_common::{fs, process::Command}; + use crate::{args::Arguments, build_root::BuildRoot}; + + const PATCH_BIN: &str = "patch"; +-const COMPILER_CMD_ENV: &str = "UPATCH_HIJACKER"; ++const COMPILER_CMD_ENV: &str = "UPATCH_HELPER"; + + const PREPARE_SCRIPT_NAME: &str = "prepare.sh"; + const BUILD_SCRIPT_NAME: &str = "build.sh"; +diff --git a/upatch-build/src/rpc/proxy.rs b/upatch-build/src/rpc/proxy.rs +index e249fa5..f63d681 100644 +--- a/upatch-build/src/rpc/proxy.rs ++++ b/upatch-build/src/rpc/proxy.rs +@@ -30,7 +30,7 @@ impl UpatchProxy { + } + + #[named] +- pub fn enable_hijack>(&self, exec_path: P) -> Result<()> { ++ pub fn hook_compiler>(&self, exec_path: P) -> Result<()> { + self.remote.call_with_args( + function_name!(), + RpcArguments::new().arg(exec_path.as_ref().to_path_buf()), +@@ -38,7 +38,7 @@ impl UpatchProxy { + } + + #[named] +- pub fn disable_hijack>(&self, exec_path: P) -> Result<()> { ++ pub fn unhook_compiler>(&self, exec_path: P) -> Result<()> { + self.remote.call_with_args( + function_name!(), + RpcArguments::new().arg(exec_path.as_ref().to_path_buf()), +diff --git a/upatch-hijacker/CMakeLists.txt b/upatch-helper/CMakeLists.txt +similarity index 81% +rename from upatch-hijacker/CMakeLists.txt +rename to upatch-helper/CMakeLists.txt +index 77d1010..bcd7295 100644 +--- a/upatch-hijacker/CMakeLists.txt ++++ b/upatch-helper/CMakeLists.txt +@@ -3,4 +3,4 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}) + + # Build components + add_subdirectory(ko) +-add_subdirectory(hijacker) ++add_subdirectory(helper) +diff --git a/upatch-helper/helper/CMakeLists.txt b/upatch-helper/helper/CMakeLists.txt +new file mode 100644 +index 0000000..fefcebe +--- /dev/null ++++ b/upatch-helper/helper/CMakeLists.txt +@@ -0,0 +1,35 @@ ++# Build helpers ++add_executable(gnu-as-helper gnu-as-helper.c) ++add_executable(gnu-compiler-helper gnu-compiler-helper.c) ++ ++# Generate helpers ++add_custom_target(generate-upatch-helpers ALL ++ COMMENT "Generating upatch helpers..." ++ COMMAND ln -f gnu-as-helper as-helper ++ COMMAND ln -f gnu-compiler-helper gcc-helper ++ COMMAND ln -f gnu-compiler-helper g++-helper ++ COMMAND ln -f gnu-compiler-helper cc-helper ++ COMMAND ln -f gnu-compiler-helper c++-helper ++ DEPENDS ++ gnu-as-helper ++ gnu-compiler-helper ++ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ++) ++ ++# Install helpers ++install( ++ PROGRAMS ++ ${CMAKE_CURRENT_BINARY_DIR}/gnu-as-helper ++ ${CMAKE_CURRENT_BINARY_DIR}/gnu-compiler-helper ++ ${CMAKE_CURRENT_BINARY_DIR}/as-helper ++ ${CMAKE_CURRENT_BINARY_DIR}/gcc-helper ++ ${CMAKE_CURRENT_BINARY_DIR}/g++-helper ++ ${CMAKE_CURRENT_BINARY_DIR}/cc-helper ++ ${CMAKE_CURRENT_BINARY_DIR}/c++-helper ++ PERMISSIONS ++ OWNER_EXECUTE OWNER_WRITE OWNER_READ ++ GROUP_EXECUTE GROUP_READ ++ WORLD_READ WORLD_EXECUTE ++ DESTINATION ++ ${SYSCARE_LIBEXEC_DIR} ++) +diff --git a/upatch-hijacker/hijacker/gnu-as-hijacker.c b/upatch-helper/helper/gnu-as-helper.c +similarity index 89% +rename from upatch-hijacker/hijacker/gnu-as-hijacker.c +rename to upatch-helper/helper/gnu-as-helper.c +index 886420e..05246c3 100644 +--- a/upatch-hijacker/hijacker/gnu-as-hijacker.c ++++ b/upatch-helper/helper/gnu-as-helper.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: Mulan PSL v2 + /* + * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * gnu-as-hijacker is licensed under Mulan PSL v2. ++ * gnu-as-helper is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 +@@ -20,7 +20,7 @@ + #include + #include + +-#include "hijacker.h" ++#include "helper.h" + + #ifndef SYS_gettid + #error "SYS_gettid is unavailable on this system" +@@ -39,8 +39,8 @@ static char g_new_output_file[PATH_MAX] = { 0 }; + /* + * The whole part: + * 1. Someone called execve() to run a compiler (inode). +- * 2. If the inode was registered, under layer would rewrite argv[0] to hijacker path. +- * 3. Hijacker would add some arguments and calls execve() again. ++ * 2. If the inode was registered, under layer would rewrite argv[0] to helper path. ++ * 3. Helper would add some arguments and calls execve() again. + * 4. Under layer redirects argv[0] to original path. + * Pid would keep same. + */ +@@ -53,27 +53,27 @@ int main(int argc, char *argv[], char *envp[]) + return -ENOENT; + } + +- // If there is no env, stop hijack +- const char *output_dir = get_hijacker_env(); ++ // If there is no env, stop helper ++ const char *output_dir = get_helper_env(); + if (output_dir == NULL) { + return execve(filename, argv, envp); + } + +- // If output dir is not a directory, stop hijack ++ // If output dir is not a directory, stop helper + struct stat output_dir_stat; + if ((stat(output_dir, &output_dir_stat) != 0) || + (!S_ISDIR(output_dir_stat.st_mode))) { + return execve(filename, argv, envp); + } + +- // If there is no output, stop hijack ++ // If there is no output, stop helper + int output_index = find_output_flag(argc, argv); + if (output_index < 0) { + return execve(filename, argv, envp); + } + output_index += 1; + +- // If the output is null device, stop hijack ++ // If the output is null device, stop helper + const char *output_file = argv[output_index]; + if (strncmp(output_file, NULL_DEV_PATH, strlen(NULL_DEV_PATH)) == 0) { + return execve(filename, argv, envp); +diff --git a/upatch-hijacker/hijacker/gnu-compiler-hijacker.c b/upatch-helper/helper/gnu-compiler-helper.c +similarity index 85% +rename from upatch-hijacker/hijacker/gnu-compiler-hijacker.c +rename to upatch-helper/helper/gnu-compiler-helper.c +index d868467..507d709 100644 +--- a/upatch-hijacker/hijacker/gnu-compiler-hijacker.c ++++ b/upatch-helper/helper/gnu-compiler-helper.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: Mulan PSL v2 + /* + * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * gnu-compiler-hijacker is licensed under Mulan PSL v2. ++ * gnu-compiler-helper is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 +@@ -14,7 +14,7 @@ + + #include + +-#include "hijacker.h" ++#include "helper.h" + + static char* APPEND_ARGS[] = { + "-gdwarf", /* obatain debug information */ +@@ -27,8 +27,8 @@ static const int APPEND_ARG_LEN = (int)(sizeof(APPEND_ARGS) / sizeof(char *)); + /* + * The whole part: + * 1. Someone called execve() to run a compiler (inode). +- * 2. If the inode was registered, under layer would rewrite argv[0] to hijacker path. +- * 3. Hijacker would add some arguments and calls execve() again. ++ * 2. If the inode was registered, under layer would rewrite argv[0] to helper path. ++ * 3. Helper would add some arguments and calls execve() again. + * 4. Under layer redirects argv[0] to original path. + * Pid would keep same. + */ +@@ -40,13 +40,13 @@ int main(int argc, char *argv[], char *envp[]) + return -ENOENT; + } + +- // If there is no env, stop hijack +- const char *hijacker_env = get_hijacker_env(); +- if (hijacker_env == NULL) { ++ // If there is no env, stop helper ++ const char *helper_env = get_helper_env(); ++ if (helper_env == NULL) { + return execve(filename, argv, envp); + } + +- // If there is no output, stop hijack ++ // If there is no output, stop helper + if (find_output_flag(argc, argv) < 0) { + return execve(filename, argv, envp); + } +diff --git a/upatch-hijacker/hijacker/hijacker.h b/upatch-helper/helper/helper.h +similarity index 83% +rename from upatch-hijacker/hijacker/hijacker.h +rename to upatch-helper/helper/helper.h +index cc820ee..67a895c 100644 +--- a/upatch-hijacker/hijacker/hijacker.h ++++ b/upatch-helper/helper/helper.h +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: Mulan PSL v2 + /* + * Copyright (c) 2024 Huawei Technologies Co., Ltd. +- * gnu-compiler-hijacker is licensed under Mulan PSL v2. ++ * gnu-compiler-helper is licensed under Mulan PSL v2. + * You can use this software according to the terms and conditions of the Mulan PSL v2. + * You may obtain a copy of Mulan PSL v2 at: + * http://license.coscl.org.cn/MulanPSL2 +@@ -12,8 +12,8 @@ + * See the Mulan PSL v2 for more details. + */ + +-#ifndef __UPATCH_HIJACKER_COMMON_H +-#define __UPATCH_HIJACKER_COMMON_H ++#ifndef __UPATCH_HELPER_COMMON_H ++#define __UPATCH_HELPER_COMMON_H + + #include + #include +@@ -22,7 +22,7 @@ + + #include + +-static const char *UPATCH_ENV_NAME = "UPATCH_HIJACKER"; ++static const char *UPATCH_ENV_NAME = "UPATCH_HELPER"; + static const char *EXEC_SELF_PATH = "/proc/self/exe"; + static const char *OUTPUT_FLAG_NAME = "-o"; + +@@ -39,7 +39,7 @@ static inline char* get_current_exec(void) + return (char *)g_filename; + } + +-static inline const char* get_hijacker_env(void) ++static inline const char* get_helper_env(void) + { + return getenv(UPATCH_ENV_NAME); + } +@@ -58,4 +58,4 @@ static inline int find_output_flag(int argc, char* const argv[]) + return -EINVAL; + } + +-#endif /* __UPATCH_HIJACKER_COMMON_H */ ++#endif /* __UPATCH_HELPER_COMMON_H */ +diff --git a/upatch-helper/ko/CMakeLists.txt b/upatch-helper/ko/CMakeLists.txt +new file mode 100644 +index 0000000..2a5b980 +--- /dev/null ++++ b/upatch-helper/ko/CMakeLists.txt +@@ -0,0 +1,32 @@ ++# Build upatch-helper kernel module ++ ++# Set target ++set(UPATCH_HELPER_KMOD "upatch_helper.ko") ++ ++# Detect kernel source path ++if (DEFINED KERNEL_VERSION) ++ set(KERNEL_SOURCE_PATH "/lib/modules/${KERNEL_VERSION}/build") ++ set(UPATCH_HELPER_KMOD_BUILD_CMD make module_version=${BUILD_VERSION} kernel=${KERNEL_SOURCE_PATH}) ++else() ++ set(UPATCH_HELPER_KMOD_BUILD_CMD make module_version=${BUILD_VERSION}) ++endif() ++ ++# Build kernel module ++add_custom_target(upatch-helper-kmod ALL ++ COMMENT "Building kernel module upatch_helper..." ++ BYPRODUCTS ${UPATCH_HELPER_KMOD} ++ COMMAND ${UPATCH_HELPER_KMOD_BUILD_CMD} ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++) ++ ++# Install kernel module ++install( ++ FILES ++ ${UPATCH_HELPER_KMOD} ++ PERMISSIONS ++ OWNER_WRITE OWNER_READ ++ GROUP_READ ++ WORLD_READ ++ DESTINATION ++ ${SYSCARE_LIBEXEC_DIR} ++) +diff --git a/upatch-hijacker/ko/LICENSE b/upatch-helper/ko/LICENSE +similarity index 100% +rename from upatch-hijacker/ko/LICENSE +rename to upatch-helper/ko/LICENSE +diff --git a/upatch-hijacker/ko/Makefile b/upatch-helper/ko/Makefile +similarity index 94% +rename from upatch-hijacker/ko/Makefile +rename to upatch-helper/ko/Makefile +index ebf6314..6ea3b72 100644 +--- a/upatch-hijacker/ko/Makefile ++++ b/upatch-helper/ko/Makefile +@@ -1,4 +1,4 @@ +-module_name ?= upatch_hijacker ++module_name ?= upatch_helper + module_version ?= "1.0-dev" + kernel ?= /lib/modules/$(shell uname -r)/build + +diff --git a/upatch-hijacker/ko/cache.c b/upatch-helper/ko/cache.c +similarity index 94% +rename from upatch-hijacker/ko/cache.c +rename to upatch-helper/ko/cache.c +index b5af6bf..4a5994f 100644 +--- a/upatch-hijacker/ko/cache.c ++++ b/upatch-helper/ko/cache.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -24,7 +24,7 @@ + + #include "log.h" + +-static const char *CACHE_SLAB_NAME = "upatch_hijacker"; ++static const char *CACHE_SLAB_NAME = "upatch_helper"; + + static struct kmem_cache *g_path_cache = NULL; + +diff --git a/upatch-hijacker/ko/cache.h b/upatch-helper/ko/cache.h +similarity index 86% +rename from upatch-hijacker/ko/cache.h +rename to upatch-helper/ko/cache.h +index e26a49c..b9bdcc4 100644 +--- a/upatch-hijacker/ko/cache.h ++++ b/upatch-helper/ko/cache.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_CACHE_H +-#define _UPATCH_HIJACKER_KO_CACHE_H ++#ifndef _UPATCH_HELPER_KO_CACHE_H ++#define _UPATCH_HELPER_KO_CACHE_H + + int cache_init(void); + void cache_exit(void); +@@ -27,4 +27,4 @@ void cache_exit(void); + char *path_buf_alloc(void); + void path_buf_free(char *buff); + +-#endif /* _UPATCH_HIJACKER_KO_CACHE_H */ ++#endif /* _UPATCH_HELPER_KO_CACHE_H */ +diff --git a/upatch-hijacker/ko/context.c b/upatch-helper/ko/context.c +similarity index 70% +rename from upatch-hijacker/ko/context.c +rename to upatch-helper/ko/context.c +index 2e406f4..3a6c920 100644 +--- a/upatch-hijacker/ko/context.c ++++ b/upatch-helper/ko/context.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -34,34 +34,34 @@ + struct context { + struct pid_namespace *ns; + struct uprobe_record *uprobe; +- struct map *hijacker_map; ++ struct map *helper_map; + }; + +-static bool find_hijacker_context(const struct context *context, ++static bool find_helper_context(const struct context *context, + const struct pid_namespace *ns); +-static void free_hijacker_context(struct context *context); ++static void free_helper_context(struct context *context); + +-static const struct map_ops HIJACK_MAP_OPS = { +- .find_value = (find_value_fn)find_hijacker_record, +- .free_value = (free_value_fn)free_hijacker_record, ++static const struct map_ops HELPER_MAP_OPS = { ++ .find_value = (find_value_fn)find_helper_record, ++ .free_value = (free_value_fn)free_helper_record, + }; + static const struct map_ops CONTEXT_MAP_OPS = { +- .find_value = (find_value_fn)find_hijacker_context, +- .free_value = (free_value_fn)free_hijacker_context, ++ .find_value = (find_value_fn)find_helper_context, ++ .free_value = (free_value_fn)free_helper_context, + }; + + static const size_t MAX_CONTEXT_NUM = 1024; +-static const size_t HIJACKER_PER_CONTEXT = 16; ++static const size_t HELPER_PER_CONTEXT = 16; + + static struct map *g_context_map = NULL; + + /* Context private interface */ +-static int create_hijacker_context(struct context **context, ++static int create_helper_context(struct context **context, + struct pid_namespace *ns, const char *path, loff_t offset) + { + struct context *new_context = NULL; + struct uprobe_record *uprobe = NULL; +- struct map *hijacker_map = NULL; ++ struct map *helper_map = NULL; + int ret = 0; + + new_context = kzalloc(sizeof(struct context), GFP_KERNEL); +@@ -70,9 +70,9 @@ static int create_hijacker_context(struct context **context, + return -ENOMEM; + } + +- ret = new_map(&hijacker_map, HIJACKER_PER_CONTEXT, &HIJACK_MAP_OPS); ++ ret = new_map(&helper_map, HELPER_PER_CONTEXT, &HELPER_MAP_OPS); + if (ret != 0) { +- pr_err("failed to create hijacker map, ret=%d\n", ret); ++ pr_err("failed to create helper map, ret=%d\n", ret); + kfree(new_context); + return ret; + } +@@ -80,7 +80,7 @@ static int create_hijacker_context(struct context **context, + ret = new_uprobe_record(&uprobe, handle_uprobe, path, offset); + if (ret != 0) { + pr_err("failed to create uprobe record, ret=%d\n", ret); +- free_map(hijacker_map); ++ free_map(helper_map); + kfree(new_context); + return ret; + } +@@ -90,20 +90,20 @@ static int create_hijacker_context(struct context **context, + pr_err("failed to register uprobe, inode=%lu, offset=0x%llx, ret=%d\n", + uprobe->inode->i_ino, uprobe->offset, ret); + free_uprobe_record(uprobe); +- free_map(hijacker_map); ++ free_map(helper_map); + kfree(new_context); + return ret; + } + + new_context->ns = get_pid_ns(ns); + new_context->uprobe = uprobe; +- new_context->hijacker_map = hijacker_map; ++ new_context->helper_map = helper_map; + + *context = new_context; + return 0; + } + +-static void free_hijacker_context(struct context *context) ++static void free_helper_context(struct context *context) + { + if (context == NULL) { + return; +@@ -114,11 +114,11 @@ static void free_hijacker_context(struct context *context) + + put_pid_ns(context->ns); + free_uprobe_record(context->uprobe); +- free_map(context->hijacker_map); ++ free_map(context->helper_map); + kfree(context); + } + +-static bool find_hijacker_context(const struct context *context, ++static bool find_helper_context(const struct context *context, + const struct pid_namespace *ns) + { + return ns_equal(context->ns, ns); +@@ -143,7 +143,7 @@ void context_exit(void) + free_map(g_context_map); + } + +-int build_hijacker_context(const char *path, loff_t offset) ++int build_helper_context(const char *path, loff_t offset) + { + struct pid_namespace *ns = task_active_pid_ns(current); + struct context *context = NULL; +@@ -153,37 +153,37 @@ int build_hijacker_context(const char *path, loff_t offset) + return -EINVAL; + } + +- ret = create_hijacker_context(&context, ns, path, offset); ++ ret = create_helper_context(&context, ns, path, offset); + if (ret != 0) { +- pr_err("failed to create hijacker context, ret=%d\n", ret); ++ pr_err("failed to create helper context, ret=%d\n", ret); + return ret; + } + +- pr_debug("hijacker context, addr=0x%lx\n", (unsigned long)context); ++ pr_debug("helper context, addr=0x%lx\n", (unsigned long)context); + ret = map_insert(g_context_map, context); + if (ret != 0) { +- pr_err("failed to register hijacker context, ret=%d\n", ret); ++ pr_err("failed to register helper context, ret=%d\n", ret); + return ret; + } + + return 0; + } + +-void destroy_hijacker_context(void) ++void destroy_helper_context(void) + { +- pr_debug("destroy hijacker context\n"); ++ pr_debug("destroy helper context\n"); + map_remove(g_context_map, task_active_pid_ns(current)); + } + +-size_t hijacker_context_count(void) ++size_t helper_context_count(void) + { + return map_size(g_context_map); + } + +-struct map *get_hijacker_map(void) ++struct map *get_helper_map(void) + { + struct pid_namespace *ns = task_active_pid_ns(current); + struct context *context = (struct context *)map_get(g_context_map, ns); + +- return (context != NULL) ? context->hijacker_map : NULL; ++ return (context != NULL) ? context->helper_map : NULL; + } +diff --git a/upatch-hijacker/ko/context.h b/upatch-helper/ko/context.h +similarity index 73% +rename from upatch-hijacker/ko/context.h +rename to upatch-helper/ko/context.h +index 6b5a50f..2054b75 100644 +--- a/upatch-hijacker/ko/context.h ++++ b/upatch-helper/ko/context.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_CONTEXT_H +-#define _UPATCH_HIJACKER_KO_CONTEXT_H ++#ifndef _UPATCH_HELPER_KO_CONTEXT_H ++#define _UPATCH_HELPER_KO_CONTEXT_H + + #include + +@@ -28,10 +28,10 @@ struct map; + int context_init(void); + void context_exit(void); + +-int build_hijacker_context(const char *path, loff_t offset); +-void destroy_hijacker_context(void); +-size_t hijacker_context_count(void); ++int build_helper_context(const char *path, loff_t offset); ++void destroy_helper_context(void); ++size_t helper_context_count(void); + +-struct map *get_hijacker_map(void); ++struct map *get_helper_map(void); + +-#endif /* _UPATCH_HIJACKER_KO_CONTEXT_H */ ++#endif /* _UPATCH_HELPER_KO_CONTEXT_H */ +diff --git a/upatch-hijacker/ko/ioctl.c b/upatch-helper/ko/ioctl.c +similarity index 64% +rename from upatch-hijacker/ko/ioctl.c +rename to upatch-helper/ko/ioctl.c +index f76b5fb..500e7d4 100644 +--- a/upatch-hijacker/ko/ioctl.c ++++ b/upatch-helper/ko/ioctl.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -32,19 +32,19 @@ + #include "context.h" + #include "utils.h" + +-static const struct file_operations HIJACKER_DEV_FOPS = { ++static const struct file_operations HELPER_DEV_FOPS = { + .owner = THIS_MODULE, + .unlocked_ioctl = handle_ioctl, + }; + +-static struct miscdevice g_hijacker_dev = { ++static struct miscdevice g_helper_dev = { + .minor = MISC_DYNAMIC_MINOR, +- .mode = UPATCH_HIJACKER_DEV_MODE, +- .name = UPATCH_HIJACKER_DEV_NAME, +- .fops = &HIJACKER_DEV_FOPS, ++ .mode = UPATCH_HELPER_DEV_MODE, ++ .name = UPATCH_HELPER_DEV_NAME, ++ .fops = &HELPER_DEV_FOPS, + }; + +-static inline int handle_enable_hijacker(void __user *arg) ++static inline int handle_enable_helper(void __user *arg) + { + int ret = 0; + upatch_enable_request_t *msg = NULL; +@@ -62,10 +62,10 @@ static inline int handle_enable_hijacker(void __user *arg) + return -EFAULT; + } + +- pr_debug("enable hijacker, path=%s, offset=0x%llx\n", msg->path, msg->offset); +- ret = build_hijacker_context(msg->path, msg->offset); ++ pr_debug("enable helper, path=%s, offset=0x%llx\n", msg->path, msg->offset); ++ ret = build_helper_context(msg->path, msg->offset); + if (ret != 0) { +- pr_err("failed to build hijacker context, ret=%d\n", ret); ++ pr_err("failed to build helper context, ret=%d\n", ret); + kfree(msg); + } + +@@ -73,21 +73,21 @@ static inline int handle_enable_hijacker(void __user *arg) + return 0; + } + +-static inline void handle_disable_hijacker(void) ++static inline void handle_disable_helper(void) + { +- pr_debug("disable hijacker\n"); +- destroy_hijacker_context(); ++ pr_debug("disable helper\n"); ++ destroy_helper_context(); + } + +-static inline int handle_register_hijacker(void __user *arg) ++static inline int handle_register_helper(void __user *arg) + { + upatch_register_request_t *msg = NULL; +- struct map *hijacker_map = get_hijacker_map(); +- struct hijacker_record *record = NULL; ++ struct map *helper_map = get_helper_map(); ++ struct helper_record *record = NULL; + int ret = 0; + +- if (hijacker_map == NULL) { +- pr_err("failed to get hijacker map\n"); ++ if (helper_map == NULL) { ++ pr_err("failed to get helper map\n"); + return -EFAULT; + } + +@@ -104,21 +104,21 @@ static inline int handle_register_hijacker(void __user *arg) + return -EFAULT; + } + +- ret = create_hijacker_record(&record, msg->exec_path, msg->jump_path); ++ ret = create_helper_record(&record, msg->exec_path, msg->jump_path); + if (ret != 0) { +- pr_err("failed to create hijacker record [%s -> %s], ret=%d\n", ++ pr_err("failed to create helper record [%s -> %s], ret=%d\n", + msg->exec_path, msg->jump_path, ret); + kfree(msg); + return ret; + } + +- pr_debug("register hijacker, inode=%lu, addr=0x%lx\n", ++ pr_debug("register helper, inode=%lu, addr=0x%lx\n", + record->exec_inode->i_ino, (unsigned long)record); +- ret = map_insert(get_hijacker_map(), record); ++ ret = map_insert(get_helper_map(), record); + if (ret != 0) { +- pr_err("failed to register hijacker record [%s -> %s], ret=%d\n", ++ pr_err("failed to register helper record [%s -> %s], ret=%d\n", + msg->exec_path, msg->jump_path, ret); +- free_hijacker_record(record); ++ free_helper_record(record); + kfree(msg); + return ret; + } +@@ -127,16 +127,16 @@ static inline int handle_register_hijacker(void __user *arg) + return 0; + } + +-static inline int handle_unregister_hijacker(void __user *arg) ++static inline int handle_unregister_helper(void __user *arg) + { + upatch_register_request_t *msg = NULL; +- struct map *hijacker_map = get_hijacker_map(); ++ struct map *helper_map = get_helper_map(); + struct inode *inode = NULL; + + int ret = 0; + +- if (hijacker_map == NULL) { +- pr_err("failed to get hijacker map\n"); ++ if (helper_map == NULL) { ++ pr_err("failed to get helper map\n"); + return -EFAULT; + } + +@@ -161,8 +161,8 @@ static inline int handle_unregister_hijacker(void __user *arg) + return -ENOENT; + } + +- pr_debug("remove hijacker, inode=%lu\n", inode->i_ino); +- map_remove(hijacker_map, inode); ++ pr_debug("remove helper, inode=%lu\n", inode->i_ino); ++ map_remove(helper_map, inode); + + kfree(msg); + return 0; +@@ -172,7 +172,7 @@ int ioctl_init(void) + { + int ret = 0; + +- ret = misc_register(&g_hijacker_dev); ++ ret = misc_register(&g_helper_dev); + if (ret != 0) { + pr_err("failed to register misc device, ret=%d\n", ret); + } +@@ -182,7 +182,7 @@ int ioctl_init(void) + + void ioctl_exit(void) + { +- misc_deregister(&g_hijacker_dev); ++ misc_deregister(&g_helper_dev); + } + + long handle_ioctl(struct file *file, +@@ -190,23 +190,23 @@ long handle_ioctl(struct file *file, + { + int ret = 0; + +- if (_IOC_TYPE(cmd) != UPATCH_HIJACKER_IOC_MAGIC) { ++ if (_IOC_TYPE(cmd) != UPATCH_HELPER_IOC_MAGIC) { + pr_info("invalid command\n"); + return -EBADMSG; + } + + switch (cmd) { +- case UPATCH_HIJACKER_ENABLE: +- ret = handle_enable_hijacker((void __user *)arg); ++ case UPATCH_HELPER_ENABLE: ++ ret = handle_enable_helper((void __user *)arg); + break; +- case UPATCH_HIJACKER_DISABLE: +- handle_disable_hijacker(); ++ case UPATCH_HELPER_DISABLE: ++ handle_disable_helper(); + break; +- case UPATCH_HIJACKER_REGISTER: +- ret = handle_register_hijacker((void __user *)arg); ++ case UPATCH_HELPER_REGISTER: ++ ret = handle_register_helper((void __user *)arg); + break; +- case UPATCH_HIJACKER_UNREGISTER: +- ret = handle_unregister_hijacker((void __user *)arg); ++ case UPATCH_HELPER_UNREGISTER: ++ ret = handle_unregister_helper((void __user *)arg); + break; + default: + ret = -EBADMSG; +diff --git a/upatch-hijacker/ko/ioctl.h b/upatch-helper/ko/ioctl.h +similarity index 69% +rename from upatch-hijacker/ko/ioctl.h +rename to upatch-helper/ko/ioctl.h +index dbcd12e..fd49961 100644 +--- a/upatch-hijacker/ko/ioctl.h ++++ b/upatch-helper/ko/ioctl.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,22 +18,22 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_IOCTL_H +-#define _UPATCH_HIJACKER_KO_IOCTL_H ++#ifndef _UPATCH_HELPER_KO_IOCTL_H ++#define _UPATCH_HELPER_KO_IOCTL_H + + #include + #include + +-#define UPATCH_HIJACKER_DEV_NAME "upatch-hijacker" +-#define UPATCH_HIJACKER_DEV_MODE 0600 ++#define UPATCH_HELPER_DEV_NAME "upatch-helper" ++#define UPATCH_HELPER_DEV_MODE 0600 + +-#define UPATCH_HIJACKER_IOC_MAGIC 0xE5 +-#define UPATCH_HIJACKER_ENABLE _IOW(UPATCH_HIJACKER_IOC_MAGIC, 0x1, \ ++#define UPATCH_HELPER_IOC_MAGIC 0xE5 ++#define UPATCH_HELPER_ENABLE _IOW(UPATCH_HELPER_IOC_MAGIC, 0x1, \ + upatch_enable_request_t) +-#define UPATCH_HIJACKER_DISABLE _IO(UPATCH_HIJACKER_IOC_MAGIC, 0x2) +-#define UPATCH_HIJACKER_REGISTER _IOW(UPATCH_HIJACKER_IOC_MAGIC, 0x3, \ ++#define UPATCH_HELPER_DISABLE _IO(UPATCH_HELPER_IOC_MAGIC, 0x2) ++#define UPATCH_HELPER_REGISTER _IOW(UPATCH_HELPER_IOC_MAGIC, 0x3, \ + upatch_register_request_t) +-#define UPATCH_HIJACKER_UNREGISTER _IOW(UPATCH_HIJACKER_IOC_MAGIC, 0x4, \ ++#define UPATCH_HELPER_UNREGISTER _IOW(UPATCH_HELPER_IOC_MAGIC, 0x4, \ + upatch_register_request_t) + + typedef struct { +@@ -52,4 +52,4 @@ int ioctl_init(void); + void ioctl_exit(void); + long handle_ioctl(struct file *file, unsigned int cmd, unsigned long arg); + +-#endif /* _UPATCH_HIJACKER_KO_IOCTL_H */ ++#endif /* _UPATCH_HELPER_KO_IOCTL_H */ +diff --git a/upatch-hijacker/ko/log.h b/upatch-helper/ko/log.h +similarity index 87% +rename from upatch-hijacker/ko/log.h +rename to upatch-helper/ko/log.h +index 2aede01..5341d10 100644 +--- a/upatch-hijacker/ko/log.h ++++ b/upatch-helper/ko/log.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_LOG_H +-#define _UPATCH_HIJACKER_KO_LOG_H ++#ifndef _UPATCH_HELPER_KO_LOG_H ++#define _UPATCH_HELPER_KO_LOG_H + + #include + #include +@@ -30,4 +30,4 @@ + + #define pr_fmt(fmt) "%s: " fmt, THIS_MODULE->name + +-#endif /* _UPATCH_HIJACKER_KO_LOG_H */ ++#endif /* _UPATCH_HELPER_KO_LOG_H */ +diff --git a/upatch-hijacker/ko/main.c b/upatch-helper/ko/main.c +similarity index 86% +rename from upatch-hijacker/ko/main.c +rename to upatch-helper/ko/main.c +index e14796e..52f0b86 100644 +--- a/upatch-hijacker/ko/main.c ++++ b/upatch-helper/ko/main.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -26,7 +26,7 @@ + #include "context.h" + #include "ioctl.h" + +-static int __init upatch_hijacker_init(void) ++static int __init upatch_helper_init(void) + { + int ret = 0; + +@@ -52,17 +52,17 @@ static int __init upatch_hijacker_init(void) + return 0; + } + +-static void __exit upatch_hijacker_exit(void) ++static void __exit upatch_helper_exit(void) + { + ioctl_exit(); + cache_exit(); + context_exit(); + } + +-module_init(upatch_hijacker_init); +-module_exit(upatch_hijacker_exit); ++module_init(upatch_helper_init); ++module_exit(upatch_helper_exit); + + MODULE_AUTHOR("renoseven (dev@renoseven.net)"); +-MODULE_DESCRIPTION("upatch compiler hijacker"); ++MODULE_DESCRIPTION("upatch compiler helper"); + MODULE_LICENSE("GPL"); + MODULE_VERSION(BUILD_VERSION); +diff --git a/upatch-hijacker/ko/map.c b/upatch-helper/ko/map.c +similarity index 99% +rename from upatch-hijacker/ko/map.c +rename to upatch-helper/ko/map.c +index 3049556..7771e8c 100644 +--- a/upatch-hijacker/ko/map.c ++++ b/upatch-helper/ko/map.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +diff --git a/upatch-hijacker/ko/map.h b/upatch-helper/ko/map.h +similarity index 90% +rename from upatch-hijacker/ko/map.h +rename to upatch-helper/ko/map.h +index 37b522b..0e5a790 100644 +--- a/upatch-hijacker/ko/map.h ++++ b/upatch-helper/ko/map.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_MAP_H +-#define _UPATCH_HIJACKER_KO_MAP_H ++#ifndef _UPATCH_HELPER_KO_MAP_H ++#define _UPATCH_HELPER_KO_MAP_H + + #include + +@@ -40,4 +40,4 @@ void map_remove(struct map *map, const void *param); + void *map_get(struct map *map, const void *param); + size_t map_size(const struct map *map); + +-#endif /* _UPATCH_HIJACKER_KO_MAP_H */ ++#endif /* _UPATCH_HELPER_KO_MAP_H */ +diff --git a/upatch-hijacker/ko/records.c b/upatch-helper/ko/records.c +similarity index 90% +rename from upatch-hijacker/ko/records.c +rename to upatch-helper/ko/records.c +index ef1e3fd..079240d 100644 +--- a/upatch-hijacker/ko/records.c ++++ b/upatch-helper/ko/records.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -76,10 +76,10 @@ void free_uprobe_record(struct uprobe_record *record) + kfree(record); + } + +-int create_hijacker_record(struct hijacker_record **record, ++int create_helper_record(struct helper_record **record, + const char *exec_path, const char *jump_path) + { +- struct hijacker_record *new_record = NULL; ++ struct helper_record *new_record = NULL; + struct inode *exec_inode = NULL; + struct inode *jump_inode = NULL; + +@@ -99,7 +99,7 @@ int create_hijacker_record(struct hijacker_record **record, + return -ENOENT; + } + +- new_record = kzalloc(sizeof(struct hijacker_record), GFP_KERNEL); ++ new_record = kzalloc(sizeof(struct helper_record), GFP_KERNEL); + if (record == NULL) { + return -ENOMEM; + } +@@ -113,7 +113,7 @@ int create_hijacker_record(struct hijacker_record **record, + return 0; + } + +-void free_hijacker_record(struct hijacker_record *record) ++void free_helper_record(struct helper_record *record) + { + if (record == NULL) { + return; +@@ -124,7 +124,7 @@ void free_hijacker_record(struct hijacker_record *record) + kfree(record); + } + +-bool find_hijacker_record(const struct hijacker_record *record, ++bool find_helper_record(const struct helper_record *record, + const struct inode *inode) + { + return (inode_equal(record->exec_inode, inode) || +diff --git a/upatch-hijacker/ko/records.h b/upatch-helper/ko/records.h +similarity index 80% +rename from upatch-hijacker/ko/records.h +rename to upatch-helper/ko/records.h +index 759ed5e..e9c8553 100644 +--- a/upatch-hijacker/ko/records.h ++++ b/upatch-helper/ko/records.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_ENTITY_H +-#define _UPATCH_HIJACKER_KO_ENTITY_H ++#ifndef _UPATCH_HELPER_KO_ENTITY_H ++#define _UPATCH_HELPER_KO_ENTITY_H + + #include + #include +@@ -36,7 +36,7 @@ struct uprobe_record { + struct uprobe_consumer *uc; + }; + +-struct hijacker_record { ++struct helper_record { + struct inode *exec_inode; + struct inode *jump_inode; + char exec_path[PATH_MAX]; +@@ -47,10 +47,10 @@ int new_uprobe_record(struct uprobe_record **record, + uprobe_handler handler, const char *path, loff_t offset); + void free_uprobe_record(struct uprobe_record *record); + +-int create_hijacker_record(struct hijacker_record **record, ++int create_helper_record(struct helper_record **record, + const char *exec_path, const char *jump_path); +-void free_hijacker_record(struct hijacker_record *record); +-bool find_hijacker_record(const struct hijacker_record *record, ++void free_helper_record(struct helper_record *record); ++bool find_helper_record(const struct helper_record *record, + const struct inode *inode); + +-#endif /* _UPATCH_HIJACKER_KO_ENTITY_H */ ++#endif /* _UPATCH_HELPER_KO_ENTITY_H */ +diff --git a/upatch-hijacker/ko/uprobe.c b/upatch-helper/ko/uprobe.c +similarity index 89% +rename from upatch-hijacker/ko/uprobe.c +rename to upatch-helper/ko/uprobe.c +index bc3c639..ab3513c 100644 +--- a/upatch-hijacker/ko/uprobe.c ++++ b/upatch-helper/ko/uprobe.c +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -74,7 +74,7 @@ static inline const char __user *new_user_str(const char *src, size_t len) + return (const char __user *)addr; + } + +-static inline const char *select_jump_path(const struct hijacker_record *record, ++static inline const char *select_jump_path(const struct helper_record *record, + const struct inode *inode) + { + if (inode_equal(inode, record->exec_inode)) { +@@ -92,8 +92,8 @@ int handle_uprobe(struct uprobe_consumer *self, struct pt_regs *regs) + const char __user *argv0 = (const char __user *)_reg_argv0; + const char __user *new_argv0 = NULL; + +- struct map *hijacker_map = get_hijacker_map(); +- const struct hijacker_record *record = NULL; ++ struct map *helper_map = get_helper_map(); ++ const struct helper_record *record = NULL; + + const char *elf_path = NULL; + const char *jump_path = NULL; +@@ -102,11 +102,11 @@ int handle_uprobe(struct uprobe_consumer *self, struct pt_regs *regs) + char *path_buff = NULL; + size_t path_len = 0; + +- if ((argv0 == NULL) || (hijacker_context_count() == 0)) { ++ if ((argv0 == NULL) || (helper_context_count() == 0)) { + return 0; + } + +- if (map_size(hijacker_map) == 0) { ++ if (map_size(helper_map) == 0) { + return 0; + } + +@@ -129,7 +129,7 @@ int handle_uprobe(struct uprobe_consumer *self, struct pt_regs *regs) + return 0; + } + +- record = (const struct hijacker_record *)map_get(hijacker_map, inode); ++ record = (const struct helper_record *)map_get(helper_map, inode); + if (record == NULL) { + pr_debug("record not found, elf_path=%s\n", elf_path); + path_buf_free(path_buff); +@@ -143,7 +143,7 @@ int handle_uprobe(struct uprobe_consumer *self, struct pt_regs *regs) + return 0; + } + path_len = strnlen(jump_path, PATH_MAX) + 1; +- pr_debug("[hijacked] elf_path=%s, jump_path=%s\n", elf_path, jump_path); ++ pr_debug("[helped] elf_path=%s, jump_path=%s\n", elf_path, jump_path); + + new_argv0 = new_user_str(jump_path, path_len); + if (new_argv0 == NULL) { +diff --git a/upatch-hijacker/ko/uprobe.h b/upatch-helper/ko/uprobe.h +similarity index 86% +rename from upatch-hijacker/ko/uprobe.h +rename to upatch-helper/ko/uprobe.h +index 06564d5..39bc11d 100644 +--- a/upatch-hijacker/ko/uprobe.h ++++ b/upatch-helper/ko/uprobe.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_UPROBE_H +-#define _UPATCH_HIJACKER_KO_UPROBE_H ++#ifndef _UPATCH_HELPER_KO_UPROBE_H ++#define _UPATCH_HELPER_KO_UPROBE_H + + #include + +@@ -28,4 +28,4 @@ struct pt_regs; + + int handle_uprobe(struct uprobe_consumer *self, struct pt_regs *regs); + +-#endif /* _UPATCH_HIJACKER_KO_UPROBE_H */ ++#endif /* _UPATCH_HELPER_KO_UPROBE_H */ +diff --git a/upatch-hijacker/ko/utils.h b/upatch-helper/ko/utils.h +similarity index 90% +rename from upatch-hijacker/ko/utils.h +rename to upatch-helper/ko/utils.h +index 5e2f7ed..2add3e6 100644 +--- a/upatch-hijacker/ko/utils.h ++++ b/upatch-helper/ko/utils.h +@@ -1,6 +1,6 @@ + // SPDX-License-Identifier: GPL-2.0 + /* +- * upatch-hijacker kernel module ++ * upatch-helper kernel module + * Copyright (C) 2024 Huawei Technologies Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify +@@ -18,8 +18,8 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#ifndef _UPATCH_HIJACKER_KO_UTILS_H +-#define _UPATCH_HIJACKER_KO_UTILS_H ++#ifndef _UPATCH_HELPER_KO_UTILS_H ++#define _UPATCH_HELPER_KO_UTILS_H + + #include + #include +@@ -47,4 +47,4 @@ static inline bool ns_equal(const struct pid_namespace *lhs, + return (lhs->ns.inum == rhs->ns.inum); + } + +-#endif /* _UPATCH_HIJACKER_KO_UTILS_H */ ++#endif /* _UPATCH_HELPER_KO_UTILS_H */ +diff --git a/upatch-hijacker/hijacker/CMakeLists.txt b/upatch-hijacker/hijacker/CMakeLists.txt +deleted file mode 100644 +index e42ffb3..0000000 +--- a/upatch-hijacker/hijacker/CMakeLists.txt ++++ /dev/null +@@ -1,35 +0,0 @@ +-# Build hijackers +-add_executable(gnu-as-hijacker gnu-as-hijacker.c) +-add_executable(gnu-compiler-hijacker gnu-compiler-hijacker.c) +- +-# Generate hijackers +-add_custom_target(generate-upatch-hijackers ALL +- COMMENT "Generating upatch hijackers..." +- COMMAND ln -f gnu-as-hijacker as-hijacker +- COMMAND ln -f gnu-compiler-hijacker gcc-hijacker +- COMMAND ln -f gnu-compiler-hijacker g++-hijacker +- COMMAND ln -f gnu-compiler-hijacker cc-hijacker +- COMMAND ln -f gnu-compiler-hijacker c++-hijacker +- DEPENDS +- gnu-as-hijacker +- gnu-compiler-hijacker +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +-) +- +-# Install hijackers +-install( +- PROGRAMS +- ${CMAKE_CURRENT_BINARY_DIR}/gnu-as-hijacker +- ${CMAKE_CURRENT_BINARY_DIR}/gnu-compiler-hijacker +- ${CMAKE_CURRENT_BINARY_DIR}/as-hijacker +- ${CMAKE_CURRENT_BINARY_DIR}/gcc-hijacker +- ${CMAKE_CURRENT_BINARY_DIR}/g++-hijacker +- ${CMAKE_CURRENT_BINARY_DIR}/cc-hijacker +- ${CMAKE_CURRENT_BINARY_DIR}/c++-hijacker +- PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_READ WORLD_EXECUTE +- DESTINATION +- ${SYSCARE_LIBEXEC_DIR} +-) +diff --git a/upatch-hijacker/ko/CMakeLists.txt b/upatch-hijacker/ko/CMakeLists.txt +deleted file mode 100644 +index 9d3c67c..0000000 +--- a/upatch-hijacker/ko/CMakeLists.txt ++++ /dev/null +@@ -1,32 +0,0 @@ +-# Build upatch-hijacker kernel module +- +-# Set target +-set(UPATCH_HIJACKER_KMOD "upatch_hijacker.ko") +- +-# Detect kernel source path +-if (DEFINED KERNEL_VERSION) +- set(KERNEL_SOURCE_PATH "/lib/modules/${KERNEL_VERSION}/build") +- set(UPATCH_HIJACKER_KMOD_BUILD_CMD make module_version=${BUILD_VERSION} kernel=${KERNEL_SOURCE_PATH}) +-else() +- set(UPATCH_HIJACKER_KMOD_BUILD_CMD make module_version=${BUILD_VERSION}) +-endif() +- +-# Build kernel module +-add_custom_target(upatch-hijacker-kmod ALL +- COMMENT "Building kernel module upatch-hijacker..." +- BYPRODUCTS ${UPATCH_HIJACKER_KMOD} +- COMMAND ${UPATCH_HIJACKER_KMOD_BUILD_CMD} +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +-) +- +-# Install kernel module +-install( +- FILES +- ${UPATCH_HIJACKER_KMOD} +- PERMISSIONS +- OWNER_WRITE OWNER_READ +- GROUP_READ +- WORLD_READ +- DESTINATION +- ${SYSCARE_LIBEXEC_DIR} +-) +diff --git a/upatch-manage/upatch-patch.c b/upatch-manage/upatch-patch.c +index cbdbbe1..8a1ad41 100644 +--- a/upatch-manage/upatch-patch.c ++++ b/upatch-manage/upatch-patch.c +@@ -730,7 +730,7 @@ int process_patch(int pid, struct upatch_elf *uelf, struct running_elf *relf, co + goto out_free; + } + +- // use uprobe to hack function. the program has been executed to the entry ++ // use uprobe to interpose function. the program has been executed to the entry + // point + + /* +@@ -850,7 +850,7 @@ int process_unpatch(int pid, const char *uuid) + goto out_free; + } + +- // use uprobe to hack function. the program has been executed to the entry ++ // use uprobe to interpose function. the program has been executed to the entry + // point + + /* +diff --git a/upatchd/src/config.rs b/upatchd/src/config.rs +index 125770d..2ddb011 100644 +--- a/upatchd/src/config.rs ++++ b/upatchd/src/config.rs +@@ -18,7 +18,7 @@ use anyhow::{anyhow, Result}; + use serde::{Deserialize, Serialize}; + use syscare_common::fs; + +-use crate::hijacker::HijackerConfig; ++use crate::helper::UpatchHelperConfig; + + const DEFAULT_SOCKET_UID: u32 = 0; + const DEFAULT_SOCKET_GID: u32 = 0; +@@ -46,7 +46,7 @@ pub struct DaemonConfig { + #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)] + pub struct Config { + pub daemon: DaemonConfig, +- pub hijacker: HijackerConfig, ++ pub helper: UpatchHelperConfig, + } + + impl Config { +diff --git a/upatchd/src/hijacker/config.rs b/upatchd/src/helper/config.rs +similarity index 70% +rename from upatchd/src/hijacker/config.rs +rename to upatchd/src/helper/config.rs +index 5f97fb1..e8eaefc 100644 +--- a/upatchd/src/hijacker/config.rs ++++ b/upatchd/src/helper/config.rs +@@ -23,26 +23,26 @@ const GCC_BINARY: &str = "/usr/bin/gcc"; + const GXX_BINARY: &str = "/usr/bin/g++"; + const AS_BINARY: &str = "/usr/bin/as"; + +-const CC_HIJACKER: &str = "/usr/libexec/syscare/cc-hijacker"; +-const CXX_HIJACKER: &str = "/usr/libexec/syscare/c++-hijacker"; +-const GCC_HIJACKER: &str = "/usr/libexec/syscare/gcc-hijacker"; +-const GXX_HIJACKER: &str = "/usr/libexec/syscare/g++-hijacker"; +-const AS_HIJACKER: &str = "/usr/libexec/syscare/as-hijacker"; ++const CC_HELPER: &str = "/usr/libexec/syscare/cc-helper"; ++const CXX_HELPER: &str = "/usr/libexec/syscare/c++-helper"; ++const GCC_HELPER: &str = "/usr/libexec/syscare/gcc-helper"; ++const GXX_HELPER: &str = "/usr/libexec/syscare/g++-helper"; ++const AS_HELPER: &str = "/usr/libexec/syscare/as-helper"; + + #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +-pub struct HijackerConfig { ++pub struct UpatchHelperConfig { + pub mapping: IndexMap, + } + +-impl Default for HijackerConfig { ++impl Default for UpatchHelperConfig { + fn default() -> Self { + Self { + mapping: indexmap! { +- PathBuf::from(CC_BINARY) => PathBuf::from(CC_HIJACKER), +- PathBuf::from(CXX_BINARY) => PathBuf::from(CXX_HIJACKER), +- PathBuf::from(GCC_BINARY) => PathBuf::from(GCC_HIJACKER), +- PathBuf::from(GXX_BINARY) => PathBuf::from(GXX_HIJACKER), +- PathBuf::from(AS_BINARY) => PathBuf::from(AS_HIJACKER), ++ PathBuf::from(CC_BINARY) => PathBuf::from(CC_HELPER), ++ PathBuf::from(CXX_BINARY) => PathBuf::from(CXX_HELPER), ++ PathBuf::from(GCC_BINARY) => PathBuf::from(GCC_HELPER), ++ PathBuf::from(GXX_BINARY) => PathBuf::from(GXX_HELPER), ++ PathBuf::from(AS_BINARY) => PathBuf::from(AS_HELPER), + }, + } + } +diff --git a/upatchd/src/hijacker/elf_resolver.rs b/upatchd/src/helper/elf_resolver.rs +similarity index 100% +rename from upatchd/src/hijacker/elf_resolver.rs +rename to upatchd/src/helper/elf_resolver.rs +diff --git a/upatchd/src/hijacker/ioctl.rs b/upatchd/src/helper/ioctl.rs +similarity index 80% +rename from upatchd/src/hijacker/ioctl.rs +rename to upatchd/src/helper/ioctl.rs +index b187979..0efbab4 100644 +--- a/upatchd/src/hijacker/ioctl.rs ++++ b/upatchd/src/helper/ioctl.rs +@@ -21,20 +21,20 @@ use syscare_common::{ffi::OsStrExt, fs}; + const KMOD_IOCTL_MAGIC: u16 = 0xE5; + + ioctl_write_ptr!( +- ioctl_enable_hijacker, ++ ioctl_enable_hook, + KMOD_IOCTL_MAGIC, + 0x1, + UpatchEnableRequest + ); +-ioctl_none!(ioctl_disable_hijacker, KMOD_IOCTL_MAGIC, 0x2); ++ioctl_none!(ioctl_disable_hook, KMOD_IOCTL_MAGIC, 0x2); + ioctl_write_ptr!( +- ioctl_register_hijacker, ++ ioctl_register_hooker, + KMOD_IOCTL_MAGIC, + 0x3, + UpatchRegisterRequest + ); + ioctl_write_ptr!( +- ioctl_unregister_hijacker, ++ ioctl_unregister_hooker, + KMOD_IOCTL_MAGIC, + 0x4, + UpatchRegisterRequest +@@ -51,18 +51,18 @@ pub struct UpatchRegisterRequest { + jump_path: [u8; PATH_MAX as usize], + } + +-pub struct HijackerIoctl { ++pub struct UpatchHelperIoctl { + dev: File, + } + +-impl HijackerIoctl { ++impl UpatchHelperIoctl { + pub fn new>(dev_path: P) -> Result { + Ok(Self { + dev: fs::open_file(dev_path)?, + }) + } + +- pub fn enable_hijacker>(&self, lib_path: P, offset: u64) -> Result<()> { ++ pub fn enable_hook>(&self, lib_path: P, offset: u64) -> Result<()> { + let mut msg = UpatchEnableRequest { + path: [0; PATH_MAX as usize], + offset: 0, +@@ -74,23 +74,23 @@ impl HijackerIoctl { + msg.offset = offset; + + unsafe { +- ioctl_enable_hijacker(self.dev.as_raw_fd(), &msg) ++ ioctl_enable_hook(self.dev.as_raw_fd(), &msg) + .map_err(|e| anyhow!("Ioctl error, ret={}", e))? + }; + + Ok(()) + } + +- pub fn disable_hijacker(&self) -> Result<()> { ++ pub fn disable_hook(&self) -> Result<()> { + unsafe { +- ioctl_disable_hijacker(self.dev.as_raw_fd()) ++ ioctl_disable_hook(self.dev.as_raw_fd()) + .map_err(|e| anyhow!("Ioctl error, ret={}", e))? + }; + + Ok(()) + } + +- pub fn register_hijacker(&self, exec_path: P, jump_path: Q) -> Result<()> ++ pub fn register_hooker(&self, exec_path: P, jump_path: Q) -> Result<()> + where + P: AsRef, + Q: AsRef, +@@ -108,14 +108,14 @@ impl HijackerIoctl { + .write_all(jump_path.as_ref().to_cstring()?.to_bytes_with_nul())?; + + unsafe { +- ioctl_register_hijacker(self.dev.as_raw_fd(), &msg) ++ ioctl_register_hooker(self.dev.as_raw_fd(), &msg) + .map_err(|e| anyhow!("Ioctl error, {}", e.desc()))? + }; + + Ok(()) + } + +- pub fn unregister_hijacker(&self, exec_path: P, jump_path: Q) -> Result<()> ++ pub fn unregister_hooker(&self, exec_path: P, jump_path: Q) -> Result<()> + where + P: AsRef, + Q: AsRef, +@@ -133,7 +133,7 @@ impl HijackerIoctl { + .write_all(jump_path.as_ref().to_cstring()?.to_bytes_with_nul())?; + + unsafe { +- ioctl_unregister_hijacker(self.dev.as_raw_fd(), &msg) ++ ioctl_unregister_hooker(self.dev.as_raw_fd(), &msg) + .map_err(|e| anyhow!("Ioctl error, {}", e.desc()))? + }; + +diff --git a/upatchd/src/hijacker/kmod.rs b/upatchd/src/helper/kmod.rs +similarity index 95% +rename from upatchd/src/hijacker/kmod.rs +rename to upatchd/src/helper/kmod.rs +index fc89f5f..59b7ede 100644 +--- a/upatchd/src/hijacker/kmod.rs ++++ b/upatchd/src/helper/kmod.rs +@@ -25,13 +25,13 @@ use syscare_common::{fs, os}; + const KMOD_SYS_PATH: &str = "/sys/module"; + + /// An RAII guard of the kernel module. +-pub struct HijackerKmodGuard { ++pub struct UpatchHelperKmodGuard { + kmod_name: String, + kmod_path: PathBuf, + sys_path: PathBuf, + } + +-impl HijackerKmodGuard { ++impl UpatchHelperKmodGuard { + pub fn new, P: AsRef>(name: S, kmod_path: P) -> Result { + let instance = Self { + kmod_name: name.as_ref().to_string(), +@@ -45,7 +45,7 @@ impl HijackerKmodGuard { + } + } + +-impl HijackerKmodGuard { ++impl UpatchHelperKmodGuard { + fn selinux_relabel_kmod(&self) -> Result<()> { + const KMOD_SECURITY_TYPE: &str = "modules_object_t"; + +@@ -92,7 +92,7 @@ impl HijackerKmodGuard { + } + } + +-impl Drop for HijackerKmodGuard { ++impl Drop for UpatchHelperKmodGuard { + fn drop(&mut self) { + if let Err(e) = self.remove_kmod() { + error!("{:?}", e); +diff --git a/upatchd/src/hijacker/mod.rs b/upatchd/src/helper/mod.rs +similarity index 52% +rename from upatchd/src/hijacker/mod.rs +rename to upatchd/src/helper/mod.rs +index d0f2c4d..85245d0 100644 +--- a/upatchd/src/hijacker/mod.rs ++++ b/upatchd/src/helper/mod.rs +@@ -24,24 +24,24 @@ mod elf_resolver; + mod ioctl; + mod kmod; + +-pub use config::HijackerConfig; ++pub use config::UpatchHelperConfig; + use elf_resolver::ElfResolver; +-use ioctl::HijackerIoctl; +-use kmod::HijackerKmodGuard; ++use ioctl::UpatchHelperIoctl; ++use kmod::UpatchHelperKmodGuard; + +-const KMOD_NAME: &str = "upatch_hijacker"; +-const KMOD_DEV_PATH: &str = "/dev/upatch-hijacker"; +-const KMOD_PATH: &str = "/usr/libexec/syscare/upatch_hijacker.ko"; ++const KMOD_NAME: &str = "upatch_helper"; ++const KMOD_DEV_PATH: &str = "/dev/upatch-helper"; ++const KMOD_PATH: &str = "/usr/libexec/syscare/upatch_helper.ko"; + +-const HIJACK_SYMBOL_NAME: &str = "execve"; ++const TARGET_SYMBOL_NAME: &str = "execve"; + +-pub struct Hijacker { +- config: HijackerConfig, +- ioctl: HijackerIoctl, +- _kmod: HijackerKmodGuard, // need to ensure this drops last ++pub struct UpatchHelper { ++ config: UpatchHelperConfig, ++ ioctl: UpatchHelperIoctl, ++ _kmod: UpatchHelperKmodGuard, // need to ensure this drops last + } + +-impl Hijacker { ++impl UpatchHelper { + fn find_symbol_addr(symbol_name: &str) -> Result<(PathBuf, u64)> { + let exec_file = MappedFile::open(os::process::path())?; + let exec_resolver = ElfResolver::new(exec_file.as_bytes())?; +@@ -59,61 +59,66 @@ impl Hijacker { + } + } + +-impl Hijacker { +- pub fn new(config: HijackerConfig) -> Result { +- debug!("Initializing hijacker kernel module..."); +- let kmod = HijackerKmodGuard::new(KMOD_NAME, KMOD_PATH)?; ++impl UpatchHelper { ++ pub fn new(config: UpatchHelperConfig) -> Result { ++ debug!("Initializing upatch kernel module..."); ++ let kmod = UpatchHelperKmodGuard::new(KMOD_NAME, KMOD_PATH)?; + +- debug!("Initializing hijacker ioctl channel..."); +- let ioctl = HijackerIoctl::new(KMOD_DEV_PATH)?; ++ debug!("Initializing upatch ioctl channel..."); ++ let ioctl = UpatchHelperIoctl::new(KMOD_DEV_PATH)?; + +- debug!("Initializing hijacker hooks..."); +- let (lib_path, offset) = Self::find_symbol_addr(HIJACK_SYMBOL_NAME)?; ++ debug!("Initializing upatch hooks..."); ++ let (lib_path, offset) = Self::find_symbol_addr(TARGET_SYMBOL_NAME)?; + info!( + "Hooking library: {}, offset: {:#x}", + lib_path.display(), + offset + ); +- ioctl.enable_hijacker(lib_path, offset)?; ++ ioctl.enable_hook(lib_path, offset)?; + + Ok(Self { + config, +- _kmod: kmod, + ioctl, ++ _kmod: kmod, + }) + } +-} + +-impl Hijacker { +- fn get_hijacker>(&self, exec_path: P) -> Result<&Path> { +- let hijacker = self +- .config +- .mapping +- .get(exec_path.as_ref()) +- .with_context(|| format!("Cannot find hijacker for {}", exec_path.as_ref().display()))? +- .as_path(); ++ pub fn register_hooker>(&self, elf_path: P) -> Result<()> { ++ let exec_path = elf_path.as_ref(); ++ let jump_path = self.jump_path(exec_path)?; + +- Ok(hijacker) ++ self.ioctl.register_hooker(exec_path, jump_path) + } + +- pub fn register>(&self, elf_path: P) -> Result<()> { ++ pub fn unregister_hooker>(&self, elf_path: P) -> Result<()> { + let exec_path = elf_path.as_ref(); +- let jump_path = self.get_hijacker(exec_path)?; ++ let jump_path = self.jump_path(exec_path)?; + +- self.ioctl.register_hijacker(exec_path, jump_path) ++ self.ioctl.unregister_hooker(exec_path, jump_path) + } ++} + +- pub fn unregister>(&self, elf_path: P) -> Result<()> { +- let exec_path = elf_path.as_ref(); +- let jump_path = self.get_hijacker(exec_path)?; ++impl UpatchHelper { ++ fn jump_path>(&self, exec_path: P) -> Result<&Path> { ++ let jump_path = self ++ .config ++ .mapping ++ .get(exec_path.as_ref()) ++ .with_context(|| { ++ format!( ++ "Cannot find hook program for {}", ++ exec_path.as_ref().display() ++ ) ++ })? ++ .as_path(); + +- self.ioctl.unregister_hijacker(exec_path, jump_path) ++ Ok(jump_path) + } + } + +-impl Drop for Hijacker { ++impl Drop for UpatchHelper { + fn drop(&mut self) { +- if let Err(e) = self.ioctl.disable_hijacker() { ++ if let Err(e) = self.ioctl.disable_hook() { + error!("{:?}", e); + } + } +diff --git a/upatchd/src/main.rs b/upatchd/src/main.rs +index 066e53e..8141679 100644 +--- a/upatchd/src/main.rs ++++ b/upatchd/src/main.rs +@@ -30,7 +30,7 @@ use syscare_common::{fs, os}; + + mod args; + mod config; +-mod hijacker; ++mod helper; + mod rpc; + + use args::Arguments; +@@ -175,7 +175,7 @@ impl Daemon { + } + + fn initialize_skeleton(&self) -> Result { +- let config = self.config.hijacker.clone(); ++ let config = self.config.helper.clone(); + let methods = SkeletonImpl::new(config)?.to_delegate(); + + let mut io_handler = IoHandler::new(); +diff --git a/upatchd/src/rpc/skeleton.rs b/upatchd/src/rpc/skeleton.rs +index 9972fc1..a6891e1 100644 +--- a/upatchd/src/rpc/skeleton.rs ++++ b/upatchd/src/rpc/skeleton.rs +@@ -18,9 +18,9 @@ use super::function::{rpc, RpcResult}; + + #[rpc(server)] + pub trait Skeleton { +- #[rpc(name = "enable_hijack")] +- fn enable_hijack(&self, exec_path: PathBuf) -> RpcResult<()>; ++ #[rpc(name = "hook_compiler")] ++ fn hook_compiler(&self, exec_path: PathBuf) -> RpcResult<()>; + +- #[rpc(name = "disable_hijack")] +- fn disable_hijack(&self, exec_path: PathBuf) -> RpcResult<()>; ++ #[rpc(name = "unhook_compiler")] ++ fn unhook_compiler(&self, exec_path: PathBuf) -> RpcResult<()>; + } +diff --git a/upatchd/src/rpc/skeleton_impl.rs b/upatchd/src/rpc/skeleton_impl.rs +index d725166..c5085ae 100644 +--- a/upatchd/src/rpc/skeleton_impl.rs ++++ b/upatchd/src/rpc/skeleton_impl.rs +@@ -17,7 +17,7 @@ use std::path::PathBuf; + use anyhow::{Context, Result}; + use log::{debug, info}; + +-use crate::hijacker::{Hijacker, HijackerConfig}; ++use crate::helper::{UpatchHelper, UpatchHelperConfig}; + + use super::{ + function::{RpcFunction, RpcResult}, +@@ -25,34 +25,34 @@ use super::{ + }; + + pub struct SkeletonImpl { +- hijacker: Hijacker, ++ helper: UpatchHelper, + } + + impl SkeletonImpl { +- pub fn new(config: HijackerConfig) -> Result { +- debug!("Initializing hijacker..."); ++ pub fn new(config: UpatchHelperConfig) -> Result { ++ debug!("Initializing upatch helper..."); + Ok(Self { +- hijacker: Hijacker::new(config).context("Failed to initialize hijacker")?, ++ helper: UpatchHelper::new(config).context("Failed to initialize upatch helper")?, + }) + } + } + + impl Skeleton for SkeletonImpl { +- fn enable_hijack(&self, elf_path: PathBuf) -> RpcResult<()> { ++ fn hook_compiler(&self, elf_path: PathBuf) -> RpcResult<()> { + RpcFunction::call(|| { +- info!("Enable hijack: {}", elf_path.display()); +- self.hijacker +- .register(&elf_path) +- .with_context(|| format!("Failed to register hijack {}", elf_path.display())) ++ info!("Hook compiler: {}", elf_path.display()); ++ self.helper ++ .register_hooker(&elf_path) ++ .with_context(|| format!("Failed to hook helper {}", elf_path.display())) + }) + } + +- fn disable_hijack(&self, elf_path: PathBuf) -> RpcResult<()> { ++ fn unhook_compiler(&self, elf_path: PathBuf) -> RpcResult<()> { + RpcFunction::call(|| { +- info!("Disable hijack: {}", elf_path.display()); +- self.hijacker +- .unregister(&elf_path) +- .with_context(|| format!("Failed to unregister hijack {}", elf_path.display())) ++ info!("Unhook compiler: {}", elf_path.display()); ++ self.helper ++ .unregister_hooker(&elf_path) ++ .with_context(|| format!("Failed to unhook compiler {}", elf_path.display())) + }) + } + } +-- +2.34.1 + diff --git a/0036-all-implement-asan-gcov-build-type.patch b/0036-all-implement-asan-gcov-build-type.patch new file mode 100644 index 0000000..9174d07 --- /dev/null +++ b/0036-all-implement-asan-gcov-build-type.patch @@ -0,0 +1,242 @@ +From c61c3e241f7a286df302a77ba6ed078dd56b9fb1 Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Mon, 17 Jun 2024 16:22:08 +0800 +Subject: [PATCH] all: implement asan & gcov build type + +Signed-off-by: liuxiaobo +--- + CMakeLists.txt | 127 ++++++++++++++++++++-------- + upatch-diff/CMakeLists.txt | 4 +- + upatch-helper/helper/CMakeLists.txt | 4 +- + upatch-manage/CMakeLists.txt | 5 +- + 4 files changed, 99 insertions(+), 41 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 659222f..04872b1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,12 @@ project(syscare) + include(GNUInstallDirs) + find_package(Git QUIET) + +-# Version ++# Build type ++if(NOT CMAKE_BUILD_TYPE) ++ set(CMAKE_BUILD_TYPE RelWithDebInfo) ++endif() ++ ++# Build version + if(NOT DEFINED BUILD_VERSION) + execute_process( + COMMAND sh -c "cat syscare/Cargo.toml | grep -F 'version' | head -n 1 | awk -F '\"' '{print $2}'" +@@ -27,12 +32,55 @@ if(GIT_FOUND) + ERROR_QUIET + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} + ) +- set(BUILD_VERSION "${BUILD_VERSION}-g${GIT_VERSION}") ++ set(PROJECT_BUILD_VERSION "${BUILD_VERSION}-g${GIT_VERSION}") + else() +- set(BUILD_VERSION "${BUILD_VERSION}") ++ set(PROJECT_BUILD_VERSION "${BUILD_VERSION}") ++endif() ++ ++# Build configurations ++if(ENABLE_ASAN) ++ set(PROJECT_BUILD_VERSION "${PROJECT_BUILD_VERSION}-asan") ++ list(APPEND PROJECT_C_BUILD_FLAGS -fsanitize=address -fno-omit-frame-pointer) ++ list(APPEND PROJECT_C_LIBRARIES asan) + endif() + +-# Set install directories ++if(ENABLE_GCOV) ++ set(PROJECT_BUILD_VERSION "${PROJECT_BUILD_VERSION}-gcov") ++ list(APPEND PROJECT_C_BUILD_FLAGS -ftest-coverage -fprofile-arcs) ++ list(APPEND PROJECT_RUST_FLAGS -C instrument-coverage) ++ list(APPEND PROJECT_C_LIBRARIES gcov) ++endif() ++ ++# Build flags ++list(APPEND PROJECT_C_BUILD_FLAGS ++ -std=gnu99 -g -Wall -O2 -Werror -Wextra ++ -DBUILD_VERSION="${PROJECT_BUILD_VERSION}" -D_FORTIFY_SOURCE=2 ++ -Wtrampolines -Wformat=2 -Wstrict-prototypes -Wdate-time ++ -Wstack-usage=8192 -Wfloat-equal -Wswitch-default ++ -Wshadow -Wconversion -Wcast-qual -Wcast-align -Wunused -Wundef ++ -funsigned-char -fstack-protector-all -fpic -fpie -ftrapv ++ -fstack-check -freg-struct-return -fno-canonical-system-headers ++ -pipe -fdebug-prefix-map=old=new ++) ++list(APPEND PROJECT_RUST_FLAGS ++ --cfg unsound_local_offset ++ -C relocation_model=pic ++ -D warnings ++ -C link-arg=-s ++ -C overflow_checks ++ -W rust_2021_incompatible_closure_captures ++) ++ ++# Link flags ++list(APPEND PROJECT_C_LINK_FLAGS ++ -pie ++ -Wl,-z,relro,-z,now ++ -Wl,-z,noexecstack -rdynamic ++ -Wl,-Bsymbolic ++ -Wl,-no-undefined ++) ++ ++# Install directories + set(SYSCARE_BINARY_DIR "${CMAKE_INSTALL_FULL_BINDIR}") + set(SYSCARE_LIBEXEC_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/syscare") + set(SYSCARE_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system") +@@ -46,48 +94,53 @@ message("╚════██║ ╚██╔╝ ╚════██║█ + message("███████║ ██║ ███████║╚██████╗██║ ██║██║ ██║███████╗") + message("╚══════╝ ╚═╝ ╚══════╝ ╚═════╝╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝") + message("---------------------------------------------------------") +-message("-- Verion: ${BUILD_VERSION}") ++message("-- Verion: ${PROJECT_BUILD_VERSION}") ++message("-- Rust flags: ${PROJECT_RUST_FLAGS}") ++message("-- Build flags: ${PROJECT_C_BUILD_FLAGS}") ++message("-- Link flags: ${PROJECT_C_LINK_FLAGS}") ++message("-- Link libraries: ${PROJECT_C_LIBRARIES}") + message("-- Binary directory: ${SYSCARE_BINARY_DIR}") + message("-- Libexec directory: ${SYSCARE_LIBEXEC_DIR}") + message("-- Service directory: ${SYSCARE_SERVICE_DIR}") + message("---------------------------------------------------------") + +-# Compile options +-add_compile_options(-DBUILD_VERSION="${BUILD_VERSION}") +-add_compile_options(-std=gnu99 -g -Wall -D_FORTIFY_SOURCE=2 -O2 -Werror -Wextra +- -Wtrampolines -Wformat=2 -Wstrict-prototypes -Wdate-time -Wstack-usage=8192 +- -Wfloat-equal -Wswitch-default -Wshadow -Wconversion -Wcast-qual -Wcast-align +- -Wunused -Wundef -funsigned-char -fstack-protector-all -fpic -fpie -ftrapv +- -fstack-check -freg-struct-return -fno-canonical-system-headers -pipe +- -fdebug-prefix-map=old=new) +-set(LINK_FLAGS "-pie -Wl,-z,relro,-z,now -Wl,-z,noexecstack -rdynamic -Wl,-Bsymbolic -Wl,-no-undefined") +-set(CMAKE_SHARED_LINKER_FLAGS "${LINK_FLAGS}") +-set(CMAKE_EXE_LINKER_FLAGS "${LINK_FLAGS}") +-# Subdirectories +-add_subdirectory(upatch-diff) +-add_subdirectory(upatch-manage) +-add_subdirectory(upatch-helper) +-add_subdirectory(misc) ++# Apply all flags ++add_compile_options(${PROJECT_C_BUILD_FLAGS}) ++add_link_options(${PROJECT_C_LINK_FLAGS}) ++link_libraries(${PROJECT_C_LIBRARIES}) + + # Build rust executables +-add_custom_target(rust-executables ALL ++foreach(FLAG IN LISTS PROJECT_RUST_FLAGS) ++ set(RUSTFLAGS "${RUSTFLAGS} ${FLAG}") ++endforeach() ++ ++add_custom_target(rust-build ALL + COMMENT "Building rust executables..." + COMMAND ${CMAKE_COMMAND} -E env +- "BUILD_VERSION=${BUILD_VERSION}" +- "RUSTFLAGS=--cfg unsound_local_offset -C relocation_model=pic -D warnings -C link-arg=-s -C overflow_checks -W rust_2021_incompatible_closure_captures" +- cargo build --release --target-dir ${CMAKE_CURRENT_BINARY_DIR} ++ "BUILD_VERSION=${PROJECT_BUILD_VERSION}" ++ "RUSTFLAGS=${RUSTFLAGS}" ++ cargo build --release --target-dir "${CMAKE_CURRENT_BINARY_DIR}/rust" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + + # Install rust binaries + install( + PROGRAMS +- ${CMAKE_CURRENT_BINARY_DIR}/release/upatchd +- ${CMAKE_CURRENT_BINARY_DIR}/release/syscared +- ${CMAKE_CURRENT_BINARY_DIR}/release/syscare ++ ${CMAKE_CURRENT_BINARY_DIR}/rust/release/upatchd ++ ${CMAKE_CURRENT_BINARY_DIR}/rust/release/syscared ++ PERMISSIONS ++ OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE ++ DESTINATION ++ ${SYSCARE_BINARY_DIR} ++) ++ ++install( ++ PROGRAMS ++ ${CMAKE_CURRENT_BINARY_DIR}/rust/release/syscare + PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ ++ OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION + ${SYSCARE_BINARY_DIR} +@@ -95,12 +148,18 @@ install( + + install( + PROGRAMS +- ${CMAKE_CURRENT_BINARY_DIR}/release/upatch-build +- ${CMAKE_CURRENT_BINARY_DIR}/release/syscare-build ++ ${CMAKE_CURRENT_BINARY_DIR}/rust/release/upatch-build ++ ${CMAKE_CURRENT_BINARY_DIR}/rust/release/syscare-build + PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ ++ OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION + ${SYSCARE_LIBEXEC_DIR} + ) ++ ++# Build other components ++add_subdirectory(upatch-diff) ++add_subdirectory(upatch-manage) ++add_subdirectory(upatch-helper) ++add_subdirectory(misc) +diff --git a/upatch-diff/CMakeLists.txt b/upatch-diff/CMakeLists.txt +index 45091fc..a1c8688 100644 +--- a/upatch-diff/CMakeLists.txt ++++ b/upatch-diff/CMakeLists.txt +@@ -18,8 +18,8 @@ install( + TARGETS + upatch-diff + PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ ++ OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION + ${SYSCARE_LIBEXEC_DIR} +diff --git a/upatch-helper/helper/CMakeLists.txt b/upatch-helper/helper/CMakeLists.txt +index fefcebe..700722b 100644 +--- a/upatch-helper/helper/CMakeLists.txt ++++ b/upatch-helper/helper/CMakeLists.txt +@@ -27,8 +27,8 @@ install( + ${CMAKE_CURRENT_BINARY_DIR}/cc-helper + ${CMAKE_CURRENT_BINARY_DIR}/c++-helper + PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ ++ OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION + ${SYSCARE_LIBEXEC_DIR} +diff --git a/upatch-manage/CMakeLists.txt b/upatch-manage/CMakeLists.txt +index 850a308..e09aa9c 100644 +--- a/upatch-manage/CMakeLists.txt ++++ b/upatch-manage/CMakeLists.txt +@@ -25,9 +25,8 @@ install( + TARGETS + ${UPATCH_MANAGE} + PERMISSIONS +- OWNER_EXECUTE OWNER_WRITE OWNER_READ +- GROUP_EXECUTE GROUP_READ +- WORLD_READ WORLD_EXECUTE ++ OWNER_READ OWNER_WRITE OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE + DESTINATION + ${SYSCARE_LIBEXEC_DIR} + ) +-- +2.34.1 + diff --git a/0037-all-clean-code.patch b/0037-all-clean-code.patch new file mode 100644 index 0000000..97aa07d --- /dev/null +++ b/0037-all-clean-code.patch @@ -0,0 +1,2498 @@ +From b1a45cacb15a1259a30452c4593c07a720534f0f Mon Sep 17 00:00:00 2001 +From: liuxiaobo +Date: Thu, 27 Jun 2024 14:38:45 +0800 +Subject: [PATCH] all: clean code + +Signed-off-by: renoseven +--- + syscare-abi/build.rs | 33 ++++---- + syscare-abi/src/patch_info.rs | 23 +++-- + syscare-build/build.rs | 33 ++++---- + syscare-build/src/build_root/mod.rs | 4 +- + syscare-build/src/build_root/package_root.rs | 4 +- + syscare-build/src/build_root/patch_root.rs | 4 +- + syscare-build/src/main.rs | 6 +- + syscare-build/src/package/build_root.rs | 4 +- + syscare-build/src/package/rpm/mod.rs | 7 +- + syscare-build/src/package/rpm/spec_builder.rs | 2 +- + syscare-build/src/package/rpm/spec_file.rs | 72 ++++++++-------- + syscare-build/src/patch/metadata.rs | 4 +- + syscare-common/build.rs | 33 ++++---- + syscare-common/src/ffi/os_str.rs | 11 +-- + syscare-common/src/fs/flock.rs | 7 +- + syscare-common/src/fs/fs_impl.rs | 83 +++++++++---------- + syscare-common/src/io/select.rs | 5 +- + syscare-common/src/os/cpu.rs | 4 +- + syscare-common/src/os/process.rs | 2 +- + syscare-common/src/os/user.rs | 67 ++++++++------- + syscare-common/src/os_str/iter.rs | 10 ++- + syscare-common/src/os_str/pattern.rs | 28 ++++--- + syscare-common/src/os_str/utf8.rs | 2 +- + syscare-common/src/process/child.rs | 6 +- + syscare-common/src/process/stdio.rs | 2 +- + syscare/build.rs | 33 ++++---- + syscare/src/executor/patch.rs | 4 +- + syscare/src/main.rs | 14 ++-- + syscare/src/rpc/remote.rs | 19 ++--- + syscared/build.rs | 33 ++++---- + syscared/src/main.rs | 14 ++-- + syscared/src/patch/driver/kpatch/sys.rs | 4 +- + syscared/src/patch/driver/mod.rs | 32 +++---- + syscared/src/patch/driver/upatch/mod.rs | 4 +- + syscared/src/patch/manager.rs | 19 ++--- + syscared/src/patch/monitor.rs | 6 +- + syscared/src/patch/resolver/kpatch.rs | 16 ++-- + syscared/src/patch/resolver/mod.rs | 10 +-- + syscared/src/patch/resolver/upatch.rs | 12 ++- + syscared/src/rpc/skeleton_impl/patch.rs | 14 ++-- + upatch-build/build.rs | 33 ++++---- + upatch-build/src/args.rs | 14 ++-- + upatch-build/src/build_root.rs | 4 +- + upatch-build/src/compiler.rs | 29 ++++--- + upatch-build/src/dwarf/mod.rs | 21 ++--- + upatch-build/src/dwarf/relocate.rs | 14 ++-- + upatch-build/src/elf/header.rs | 4 - + upatch-build/src/elf/read/elfs.rs | 10 +-- + upatch-build/src/elf/read/section.rs | 19 ++--- + upatch-build/src/elf/read/symbol.rs | 34 ++++---- + upatch-build/src/elf/write/elfs.rs | 10 ++- + upatch-build/src/elf/write/symbol.rs | 40 ++++----- + upatch-build/src/file_relation.rs | 12 +-- + upatch-build/src/main.rs | 16 ++-- + upatch-build/src/pattern_path.rs | 26 +++--- + upatch-build/src/resolve.rs | 79 +++++++++--------- + upatch-build/src/rpc/remote.rs | 19 ++--- + upatchd/build.rs | 33 ++++---- + upatchd/src/helper/elf_resolver.rs | 4 +- + upatchd/src/helper/ioctl.rs | 1 + + upatchd/src/main.rs | 14 ++-- + 61 files changed, 560 insertions(+), 566 deletions(-) + +diff --git a/syscare-abi/build.rs b/syscare-abi/build.rs +index 8a86f63..ed83c43 100644 +--- a/syscare-abi/build.rs ++++ b/syscare-abi/build.rs +@@ -12,26 +12,25 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{env, process::Command}; ++use std::{env, ffi::OsStr, os::unix::ffi::OsStrExt, process::Command}; + + fn rewrite_version() { +- const ENV_VERSION_NAME: &str = "BUILD_VERSION"; +- const PKG_VERSION_NAME: &str = "CARGO_PKG_VERSION"; ++ const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); ++ const ENV_VERSION: Option<&str> = option_env!("BUILD_VERSION"); + +- let version = env::var(ENV_VERSION_NAME).unwrap_or_else(|_| { +- let pkg_version = env::var(PKG_VERSION_NAME).expect("Failed to fetch package version"); +- let git_output = Command::new("git") +- .args(["rev-parse", "--short", "HEAD"]) +- .output() +- .map(|output| String::from_utf8(output.stdout).expect("Failed to fetch git version")); +- +- match git_output { +- Ok(git_version) => format!("{}-g{}", pkg_version, git_version), +- Err(_) => pkg_version, +- } +- }); +- +- println!("cargo:rustc-env={}={}", PKG_VERSION_NAME, version); ++ println!( ++ "cargo:rustc-env=CARGO_PKG_VERSION={}", ++ ENV_VERSION.map(String::from).unwrap_or_else(|| { ++ Command::new("git") ++ .args(["rev-parse", "--short", "HEAD"]) ++ .output() ++ .map(|output| { ++ let git_version = OsStr::from_bytes(&output.stdout).to_string_lossy(); ++ format!("{}-g{}", PKG_VERSION, git_version) ++ }) ++ .unwrap_or_else(|_| PKG_VERSION.to_string()) ++ }) ++ ); + } + + fn main() { +diff --git a/syscare-abi/src/patch_info.rs b/syscare-abi/src/patch_info.rs +index 08cc2c7..246f830 100644 +--- a/syscare-abi/src/patch_info.rs ++++ b/syscare-abi/src/patch_info.rs +@@ -96,21 +96,18 @@ impl std::fmt::Display for PatchInfo { + writeln!(f, "patches:")?; + let last_idx = self.patches.len() - 1; + for (patch_idx, patch_file) in self.patches.iter().enumerate() { +- match patch_idx == last_idx { +- false => { +- if patch_idx >= LIST_DISPLAY_LIMIT { +- writeln!(f, "* ......")?; +- break; +- } +- writeln!(f, "* {}", patch_file.name.to_string_lossy())? ++ if patch_idx != last_idx { ++ if patch_idx >= LIST_DISPLAY_LIMIT { ++ writeln!(f, "* ......")?; ++ break; + } +- true => { +- if patch_idx >= LIST_DISPLAY_LIMIT { +- write!(f, "* ......")?; +- break; +- } +- write!(f, "* {}", patch_file.name.to_string_lossy())? ++ writeln!(f, "* {}", patch_file.name.to_string_lossy())? ++ } else { ++ if patch_idx >= LIST_DISPLAY_LIMIT { ++ write!(f, "* ......")?; ++ break; + } ++ write!(f, "* {}", patch_file.name.to_string_lossy())? + } + } + } +diff --git a/syscare-build/build.rs b/syscare-build/build.rs +index b3de093..1ca9609 100644 +--- a/syscare-build/build.rs ++++ b/syscare-build/build.rs +@@ -12,26 +12,25 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{env, process::Command}; ++use std::{env, ffi::OsStr, os::unix::ffi::OsStrExt, process::Command}; + + fn rewrite_version() { +- const ENV_VERSION_NAME: &str = "BUILD_VERSION"; +- const PKG_VERSION_NAME: &str = "CARGO_PKG_VERSION"; ++ const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); ++ const ENV_VERSION: Option<&str> = option_env!("BUILD_VERSION"); + +- let version = env::var(ENV_VERSION_NAME).unwrap_or_else(|_| { +- let pkg_version = env::var(PKG_VERSION_NAME).expect("Failed to fetch package version"); +- let git_output = Command::new("git") +- .args(["rev-parse", "--short", "HEAD"]) +- .output() +- .map(|output| String::from_utf8(output.stdout).expect("Failed to fetch git version")); +- +- match git_output { +- Ok(git_version) => format!("{}-g{}", pkg_version, git_version), +- Err(_) => pkg_version, +- } +- }); +- +- println!("cargo:rustc-env={}={}", PKG_VERSION_NAME, version); ++ println!( ++ "cargo:rustc-env=CARGO_PKG_VERSION={}", ++ ENV_VERSION.map(String::from).unwrap_or_else(|| { ++ Command::new("git") ++ .args(["rev-parse", "--short", "HEAD"]) ++ .output() ++ .map(|output| { ++ let git_version = OsStr::from_bytes(&output.stdout).to_string_lossy(); ++ format!("{}-g{}", PKG_VERSION, git_version) ++ }) ++ .unwrap_or_else(|_| PKG_VERSION.to_string()) ++ }) ++ ); + } + + fn main() { +diff --git a/syscare-build/src/build_root/mod.rs b/syscare-build/src/build_root/mod.rs +index 6a12788..395fead 100644 +--- a/syscare-build/src/build_root/mod.rs ++++ b/syscare-build/src/build_root/mod.rs +@@ -36,8 +36,8 @@ pub struct BuildRoot { + } + + impl BuildRoot { +- pub fn new>(path: P) -> Result { +- let path = path.as_ref().to_path_buf(); ++ pub fn new>(directory: P) -> Result { ++ let path = directory.as_ref().to_path_buf(); + let package = PackageRoot::new(path.join(PACKAGE_ROOT_NAME))?; + let patch = PatchRoot::new(path.join(PATCH_ROOT_NAME))?; + let log_file = path.join(BUILD_LOG_NAME); +diff --git a/syscare-build/src/build_root/package_root.rs b/syscare-build/src/build_root/package_root.rs +index 724a42b..75ff65d 100644 +--- a/syscare-build/src/build_root/package_root.rs ++++ b/syscare-build/src/build_root/package_root.rs +@@ -32,8 +32,8 @@ pub struct PackageRoot { + } + + impl PackageRoot { +- pub fn new>(path: P) -> Result { +- let path = path.as_ref().to_path_buf(); ++ pub fn new>(directory: P) -> Result { ++ let path = directory.as_ref().to_path_buf(); + let source = path.join(SOURCE_DIR_NAME); + let debuginfo = path.join(DEBUGINFO_DIR_NAME); + let build_root = PackageBuildRoot::new(path.join(BUILD_ROOT_DIR_NAME))?; +diff --git a/syscare-build/src/build_root/patch_root.rs b/syscare-build/src/build_root/patch_root.rs +index af8ec6b..d493233 100644 +--- a/syscare-build/src/build_root/patch_root.rs ++++ b/syscare-build/src/build_root/patch_root.rs +@@ -28,8 +28,8 @@ pub struct PatchRoot { + } + + impl PatchRoot { +- pub fn new>(base_dir: P) -> Result { +- let path = base_dir.as_ref().to_path_buf(); ++ pub fn new>(directory: P) -> Result { ++ let path = directory.as_ref().to_path_buf(); + let build = path.join(BUILD_DIR_NAME); + let output = path.join(OUTPUT_DIR_NAME); + +diff --git a/syscare-build/src/main.rs b/syscare-build/src/main.rs +index 1faa803..bfff3b4 100644 +--- a/syscare-build/src/main.rs ++++ b/syscare-build/src/main.rs +@@ -217,10 +217,10 @@ impl SyscareBuild { + .find(|entry| entry.target_pkg.name == KERNEL_PKG_NAME); + + match (pkg_entry, kernel_entry) { +- (Some(entry), Some(kernel_entry)) => Ok(( ++ (Some(p_entry), Some(k_entry)) => Ok(( + PatchType::KernelPatch, +- entry.clone(), +- Some(kernel_entry.clone()), ++ p_entry.clone(), ++ Some(k_entry.clone()), + )), + (None, Some(entry)) => Ok((PatchType::KernelPatch, entry.clone(), None)), + (Some(entry), None) => Ok((PatchType::UserPatch, entry.clone(), None)), +diff --git a/syscare-build/src/package/build_root.rs b/syscare-build/src/package/build_root.rs +index 6124156..d8ee182 100644 +--- a/syscare-build/src/package/build_root.rs ++++ b/syscare-build/src/package/build_root.rs +@@ -36,8 +36,8 @@ pub struct PackageBuildRoot { + } + + impl PackageBuildRoot { +- pub fn new>(path: P) -> Result { +- let path = path.as_ref().to_path_buf(); ++ pub fn new>(directory: P) -> Result { ++ let path = directory.as_ref().to_path_buf(); + let build = path.join(BUILD_DIR_NAME); + let buildroot = path.join(BUILDROOT_DIR_NAME); + let rpms = path.join(RPMS_DIR_NAME); +diff --git a/syscare-build/src/package/rpm/mod.rs b/syscare-build/src/package/rpm/mod.rs +index 0e9f77c..4054f67 100644 +--- a/syscare-build/src/package/rpm/mod.rs ++++ b/syscare-build/src/package/rpm/mod.rs +@@ -74,9 +74,10 @@ impl Package for RpmPackage { + } + + let name = pkg_info[0].to_owned(); +- let kind = match pkg_info[6] == SPEC_TAG_VALUE_NONE { +- true => PackageType::SourcePackage, +- false => PackageType::BinaryPackage, ++ let kind = if pkg_info[6] == SPEC_TAG_VALUE_NONE { ++ PackageType::SourcePackage ++ } else { ++ PackageType::BinaryPackage + }; + let arch = pkg_info[1].to_owned(); + let epoch = pkg_info[2].to_owned(); +diff --git a/syscare-build/src/package/rpm/spec_builder.rs b/syscare-build/src/package/rpm/spec_builder.rs +index 5570c34..a24954f 100644 +--- a/syscare-build/src/package/rpm/spec_builder.rs ++++ b/syscare-build/src/package/rpm/spec_builder.rs +@@ -113,7 +113,7 @@ impl RpmSpecBuilder { + patch_info.name + ); + let pkg_version = format!("{}-{}", patch_info.version, patch_info.release); +- let pkg_root = Path::new(PKG_INSTALL_DIR).join(&patch_info.uuid.to_string()); ++ let pkg_root = Path::new(PKG_INSTALL_DIR).join(patch_info.uuid.to_string()); + + let mut spec = RpmSpecFile::new( + pkg_name, +diff --git a/syscare-build/src/package/rpm/spec_file.rs b/syscare-build/src/package/rpm/spec_file.rs +index 17dcbe3..bd7b647 100644 +--- a/syscare-build/src/package/rpm/spec_file.rs ++++ b/syscare-build/src/package/rpm/spec_file.rs +@@ -62,33 +62,33 @@ impl RpmSpecFile { + description: String, + ) -> Self { + Self { +- defines: Default::default(), ++ defines: BTreeSet::default(), + name, + version, + release, +- group: Default::default(), ++ group: Option::default(), + license, +- url: Default::default(), ++ url: Option::default(), + summary, +- build_requires: Default::default(), +- requires: Default::default(), +- conflicts: Default::default(), +- suggests: Default::default(), +- recommends: Default::default(), ++ build_requires: HashSet::default(), ++ requires: HashSet::default(), ++ conflicts: HashSet::default(), ++ suggests: HashSet::default(), ++ recommends: HashSet::default(), + description, + prep: SPEC_SCRIPT_VALUE_NONE.to_string(), + build: SPEC_SCRIPT_VALUE_NONE.to_string(), + install: SPEC_SCRIPT_VALUE_NONE.to_string(), +- check: Default::default(), +- pre: Default::default(), +- post: Default::default(), +- preun: Default::default(), +- postun: Default::default(), +- defattr: Default::default(), +- files: Default::default(), +- source: Default::default(), +- patch: Default::default(), +- change_log: Default::default(), ++ check: Option::default(), ++ pre: Option::default(), ++ post: Option::default(), ++ preun: Option::default(), ++ postun: Option::default(), ++ defattr: Option::default(), ++ files: BTreeSet::default(), ++ source: BTreeSet::default(), ++ patch: BTreeSet::default(), ++ change_log: Option::default(), + } + } + } +@@ -204,33 +204,33 @@ impl RpmSpecFile { + impl Default for RpmSpecFile { + fn default() -> Self { + Self { +- defines: Default::default(), ++ defines: BTreeSet::default(), + name: SPEC_TAG_VALUE_NONE.to_string(), + version: SPEC_TAG_VALUE_NONE.to_string(), + release: SPEC_TAG_VALUE_NONE.to_string(), +- group: Default::default(), ++ group: Option::default(), + license: SPEC_TAG_VALUE_NONE.to_string(), +- url: Default::default(), ++ url: Option::default(), + summary: SPEC_TAG_VALUE_NONE.to_string(), +- build_requires: Default::default(), +- requires: Default::default(), +- conflicts: Default::default(), +- suggests: Default::default(), +- recommends: Default::default(), ++ build_requires: HashSet::default(), ++ requires: HashSet::default(), ++ conflicts: HashSet::default(), ++ suggests: HashSet::default(), ++ recommends: HashSet::default(), + description: SPEC_TAG_VALUE_NONE.to_string(), + prep: SPEC_SCRIPT_VALUE_NONE.to_string(), + build: SPEC_SCRIPT_VALUE_NONE.to_string(), + install: SPEC_SCRIPT_VALUE_NONE.to_string(), +- check: Default::default(), +- pre: Default::default(), +- post: Default::default(), +- preun: Default::default(), +- postun: Default::default(), +- defattr: Default::default(), +- files: Default::default(), +- source: Default::default(), +- patch: Default::default(), +- change_log: Default::default(), ++ check: Option::default(), ++ pre: Option::default(), ++ post: Option::default(), ++ preun: Option::default(), ++ postun: Option::default(), ++ defattr: Option::default(), ++ files: BTreeSet::default(), ++ source: BTreeSet::default(), ++ patch: BTreeSet::default(), ++ change_log: Option::default(), + } + } + } +diff --git a/syscare-build/src/patch/metadata.rs b/syscare-build/src/patch/metadata.rs +index 918b487..0911693 100644 +--- a/syscare-build/src/patch/metadata.rs ++++ b/syscare-build/src/patch/metadata.rs +@@ -35,8 +35,8 @@ pub struct PatchMetadata { + } + + impl PatchMetadata { +- pub fn new>(root_dir: P) -> Self { +- let root_dir = root_dir.as_ref().to_path_buf(); ++ pub fn new>(directory: P) -> Self { ++ let root_dir = directory.as_ref().to_path_buf(); + let metadata_dir = root_dir.join(METADATA_DIR_NAME); + let package_path = root_dir.join(METADATA_PKG_NAME); + let metadata_path = metadata_dir.join(METADATA_FILE_NAME); +diff --git a/syscare-common/build.rs b/syscare-common/build.rs +index 1019998..ca9d78c 100644 +--- a/syscare-common/build.rs ++++ b/syscare-common/build.rs +@@ -12,26 +12,25 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{env, process::Command}; ++use std::{env, ffi::OsStr, os::unix::ffi::OsStrExt, process::Command}; + + fn rewrite_version() { +- const ENV_VERSION_NAME: &str = "BUILD_VERSION"; +- const PKG_VERSION_NAME: &str = "CARGO_PKG_VERSION"; ++ const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); ++ const ENV_VERSION: Option<&str> = option_env!("BUILD_VERSION"); + +- let version = env::var(ENV_VERSION_NAME).unwrap_or_else(|_| { +- let pkg_version = env::var(PKG_VERSION_NAME).expect("Failed to fetch package version"); +- let git_output = Command::new("git") +- .args(["rev-parse", "--short", "HEAD"]) +- .output() +- .map(|output| String::from_utf8(output.stdout).expect("Failed to fetch git version")); +- +- match git_output { +- Ok(git_version) => format!("{}-g{}", pkg_version, git_version), +- Err(_) => pkg_version, +- } +- }); +- +- println!("cargo:rustc-env={}={}", PKG_VERSION_NAME, version); ++ println!( ++ "cargo:rustc-env=CARGO_PKG_VERSION={}", ++ ENV_VERSION.map(String::from).unwrap_or_else(|| { ++ Command::new("git") ++ .args(["rev-parse", "--short", "HEAD"]) ++ .output() ++ .map(|output| { ++ let git_version = OsStr::from_bytes(&output.stdout).to_string_lossy(); ++ format!("{}-g{}", PKG_VERSION, git_version) ++ }) ++ .unwrap_or_else(|_| PKG_VERSION.to_string()) ++ }) ++ ); + } + + fn main() { +diff --git a/syscare-common/src/ffi/os_str.rs b/syscare-common/src/ffi/os_str.rs +index 43a9adc..2db26c8 100644 +--- a/syscare-common/src/ffi/os_str.rs ++++ b/syscare-common/src/ffi/os_str.rs +@@ -37,10 +37,7 @@ pub trait OsStrExt: AsRef { + + let haystack = self.as_ref().as_bytes(); + match haystack.get(index) { +- Some(&b) => { +- // This is bit magic equivalent to: b < 128 || b >= 192 +- b as i8 >= -0x40 +- } ++ Some(&b) => !(128..192).contains(&b), + None => index == haystack.len(), + } + } +@@ -135,14 +132,12 @@ pub trait OsStrExt: AsRef { + } + + fn split_whitespace(&self) -> Filter, FilterFn> { +- self.split(char::is_whitespace as SplitFn) ++ self.split(SplitFn::from(char::is_whitespace)) + .filter(|s| !s.is_empty()) + } + + fn split_at(&self, mid: usize) -> (&OsStr, &OsStr) { +- if !self.is_char_boundary(mid) { +- panic!("Failed to slice osstring"); +- } ++ debug_assert!(self.is_char_boundary(mid), "Split out of char boundary"); + + let (lhs, rhs) = self.as_ref().as_bytes().split_at(mid); + (OsStr::from_bytes(lhs), OsStr::from_bytes(rhs)) +diff --git a/syscare-common/src/fs/flock.rs b/syscare-common/src/fs/flock.rs +index b5639a8..bfd39d7 100644 +--- a/syscare-common/src/fs/flock.rs ++++ b/syscare-common/src/fs/flock.rs +@@ -57,9 +57,10 @@ impl FileLock { + impl FileLock { + pub fn new>(path: P, kind: FileLockType) -> Result { + let file_path = path.as_ref(); +- let inner = match file_path.exists() { +- true => File::open(file_path), +- false => File::create(file_path), ++ let inner = if file_path.exists() { ++ File::open(file_path) ++ } else { ++ File::create(file_path) + } + .with_context(|| format!("Failed to create flock on {}", file_path.display()))?; + +diff --git a/syscare-common/src/fs/fs_impl.rs b/syscare-common/src/fs/fs_impl.rs +index af0f60c..e794c98 100644 +--- a/syscare-common/src/fs/fs_impl.rs ++++ b/syscare-common/src/fs/fs_impl.rs +@@ -201,42 +201,50 @@ where + P: AsRef, + S: AsRef, + { +- let path = path.as_ref().to_cstring()?; +- let name = name.as_ref().to_cstring()?; ++ let file_path = path.as_ref().to_cstring()?; ++ let xattr_name = name.as_ref().to_cstring()?; + + /* + * SAFETY: + * This libc function is marked 'unsafe' as unchecked buffer may cause overflow. + * In our implementation, the buffer is checked properly, so that would be safe. + */ +- let ret = unsafe { nix::libc::getxattr(path.as_ptr(), name.as_ptr(), null_mut(), 0) }; ++ let mut ret = ++ unsafe { nix::libc::getxattr(file_path.as_ptr(), xattr_name.as_ptr(), null_mut(), 0) }; + if ret == -1 { + return Err(std::io::Error::last_os_error()).rewrite_err(format!( + "Cannot get path {} xattr {}", +- path.to_string_lossy(), +- name.to_string_lossy() ++ file_path.to_string_lossy(), ++ xattr_name.to_string_lossy() + )); + } + +- let mut buf = vec![0; ret as usize]; +- let value = buf.as_mut_ptr() as *mut c_void; ++ let mut buf = vec![0; ret.unsigned_abs()]; ++ let value_ptr = buf.as_mut_ptr().cast::(); + + /* + * SAFETY: + * This libc function is marked 'unsafe' as unchecked buffer may cause overflow. + * In our implementation, the buffer is checked properly, so that would be safe. + */ +- let ret = unsafe { nix::libc::getxattr(path.as_ptr(), name.as_ptr(), value, buf.len()) }; ++ ret = unsafe { ++ nix::libc::getxattr( ++ file_path.as_ptr(), ++ xattr_name.as_ptr(), ++ value_ptr, ++ buf.len(), ++ ) ++ }; + if ret == -1 { + return Err(std::io::Error::last_os_error()).rewrite_err(format!( + "Cannot get path {} xattr {}", +- path.to_string_lossy(), +- name.to_string_lossy(), ++ file_path.to_string_lossy(), ++ xattr_name.to_string_lossy(), + )); + } + +- let value = CStr::from_bytes_with_nul(&buf[0..ret as usize]) +- .expect("asdf") ++ let value = CStr::from_bytes_with_nul(&buf[0..ret.unsigned_abs()]) ++ .unwrap_or_default() + .to_os_string(); + + Ok(value) +@@ -248,10 +256,10 @@ where + S: AsRef, + T: AsRef, + { +- let path = path.as_ref().to_cstring()?; +- let name = name.as_ref().to_cstring()?; +- let value = value.as_ref().to_cstring()?; +- let size = value.to_bytes_with_nul().len(); ++ let file_path = path.as_ref().to_cstring()?; ++ let xattr_name = name.as_ref().to_cstring()?; ++ let xattr_value = value.as_ref().to_cstring()?; ++ let size = xattr_value.to_bytes_with_nul().len(); + + /* + * SAFETY: +@@ -260,9 +268,9 @@ where + */ + let ret = unsafe { + nix::libc::setxattr( +- path.as_ptr(), +- name.as_ptr(), +- value.as_ptr() as *const c_void, ++ file_path.as_ptr(), ++ xattr_name.as_ptr(), ++ xattr_value.as_ptr().cast::(), + size, + 0, + ) +@@ -270,8 +278,8 @@ where + if ret == -1 { + return Err(std::io::Error::last_os_error()).rewrite_err(format!( + "Cannot set {} xattr {}", +- path.to_string_lossy(), +- name.to_string_lossy() ++ file_path.to_string_lossy(), ++ xattr_name.to_string_lossy() + )); + } + +@@ -425,13 +433,10 @@ where + return false; + } + if let Some(file_name) = file_path.file_name() { +- match options.fuzz { +- false => { +- return file_name == name.as_ref(); +- } +- true => { +- return file_name.contains(name.as_ref()); +- } ++ if options.fuzz { ++ return file_name.contains(name.as_ref()); ++ } else { ++ return file_name == name.as_ref(); + } + } + false +@@ -459,13 +464,10 @@ where + return false; + } + if let Some(file_name) = file_path.file_name() { +- match options.fuzz { +- false => { +- return file_name == name.as_ref(); +- } +- true => { +- return file_name.contains(name.as_ref()); +- } ++ if options.fuzz { ++ return file_name.contains(name.as_ref()); ++ } else { ++ return file_name == name.as_ref(); + } + } + false +@@ -526,13 +528,10 @@ where + return false; + } + if let Some(file_name) = file_path.file_name() { +- match options.fuzz { +- false => { +- return file_name == name.as_ref(); +- } +- true => { +- return file_name.contains(name.as_ref()); +- } ++ if options.fuzz { ++ return file_name.contains(name.as_ref()); ++ } else { ++ return file_name == name.as_ref(); + } + } + false +diff --git a/syscare-common/src/io/select.rs b/syscare-common/src/io/select.rs +index 59e28ac..5d9400f 100644 +--- a/syscare-common/src/io/select.rs ++++ b/syscare-common/src/io/select.rs +@@ -32,7 +32,7 @@ impl Select { + Self::with_timeout(fds, None) + } + +- pub fn with_timeout(fds: I, timeout: Option) -> Self ++ pub fn with_timeout(fds: I, duration: Option) -> Self + where + I: IntoIterator, + F: AsRawFd, +@@ -44,8 +44,7 @@ impl Select { + let readfds = FdSet::new(); + let writefds = FdSet::new(); + let errorfds = FdSet::new(); +- let timeout = timeout +- .map(|timeout| TimeVal::new(timeout.as_secs() as i64, timeout.subsec_micros() as i64)); ++ let timeout = duration.map(|t| TimeVal::new(t.as_secs() as i64, t.subsec_micros() as i64)); + + Self { + fd_set, +diff --git a/syscare-common/src/os/cpu.rs b/syscare-common/src/os/cpu.rs +index 62baa17..ead7eee 100644 +--- a/syscare-common/src/os/cpu.rs ++++ b/syscare-common/src/os/cpu.rs +@@ -30,10 +30,10 @@ pub fn arch() -> &'static OsStr { + pub fn num() -> usize { + lazy_static! { + static ref CPU_NUM: usize = { +- let cpu_set = sched_getaffinity(getpid()).expect("Failed to get thread CPU affinity"); ++ let cpu_set = sched_getaffinity(getpid()).unwrap_or_default(); + let mut cpu_count = 0; + for i in 0..CpuSet::count() { +- if cpu_set.is_set(i).expect("Failed to check cpu set") { ++ if cpu_set.is_set(i).unwrap_or_default() { + cpu_count += 1; + } + } +diff --git a/syscare-common/src/os/process.rs b/syscare-common/src/os/process.rs +index 2cf4ec9..d992372 100644 +--- a/syscare-common/src/os/process.rs ++++ b/syscare-common/src/os/process.rs +@@ -30,7 +30,7 @@ pub fn id() -> i32 { + pub fn path() -> &'static Path { + lazy_static! { + static ref PROCESS_PATH: PathBuf = +- std::env::current_exe().expect("Read process path failed"); ++ std::env::current_exe().unwrap_or_else(|_| PathBuf::from("/")); + } + PROCESS_PATH.as_path() + } +diff --git a/syscare-common/src/os/user.rs b/syscare-common/src/os/user.rs +index ebf2a14..db2e10e 100644 +--- a/syscare-common/src/os/user.rs ++++ b/syscare-common/src/os/user.rs +@@ -12,71 +12,80 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::ffi::OsStr; +-use std::path::Path; ++use std::{ ++ ffi::{CString, OsStr}, ++ path::{Path, PathBuf}, ++}; + +-use lazy_static::*; +-use nix::unistd::{getuid, User}; ++use lazy_static::lazy_static; ++use nix::unistd::{getuid, Gid, Uid, User}; + + use crate::ffi::CStrExt; + +-#[inline(always)] + fn info() -> &'static User { + lazy_static! { +- static ref USER: User = User::from_uid(getuid()) +- .expect("Failed to read user info") +- .unwrap(); ++ static ref USER_INFO: User = User::from_uid(getuid()) ++ .unwrap_or_default() ++ .unwrap_or(User { ++ name: String::from("root"), ++ passwd: CString::default(), ++ uid: Uid::from_raw(0), ++ gid: Gid::from_raw(0), ++ gecos: CString::default(), ++ dir: PathBuf::from("/root"), ++ shell: PathBuf::from("/bin/sh"), ++ }); + } +- &USER ++ &USER_INFO + } + + pub fn name() -> &'static str { +- info().name.as_str() ++ self::info().name.as_str() + } + + pub fn passwd() -> &'static OsStr { +- info().passwd.as_os_str() ++ self::info().passwd.as_os_str() + } + + pub fn id() -> u32 { +- info().uid.as_raw() ++ self::info().uid.as_raw() + } + + pub fn gid() -> u32 { +- info().gid.as_raw() ++ self::info().gid.as_raw() + } + + pub fn gecos() -> &'static OsStr { +- info().gecos.as_os_str() ++ self::info().gecos.as_os_str() + } + + pub fn home() -> &'static Path { +- info().dir.as_path() ++ self::info().dir.as_path() + } + + pub fn shell() -> &'static Path { +- info().shell.as_path() ++ self::info().shell.as_path() + } + + #[test] + fn test() { +- println!("name: {}", name()); +- assert!(!name().is_empty()); ++ println!("name: {}", self::name()); ++ assert!(!self::name().is_empty()); + +- println!("passwd: {}", passwd().to_string_lossy()); +- assert!(!passwd().is_empty()); ++ println!("passwd: {}", self::passwd().to_string_lossy()); ++ assert!(!self::passwd().is_empty()); + +- println!("id: {}", id()); +- assert!(id() > 0); ++ println!("id: {}", self::id()); ++ assert!(id() < u32::MAX); + +- println!("gid: {}", gid()); +- assert!(gid() > 0); ++ println!("gid: {}", self::gid()); ++ assert!(gid() < u32::MAX); + +- println!("gecos: {}", gecos().to_string_lossy()); ++ println!("gecos: {}", self::gecos().to_string_lossy()); + +- println!("home: {}", home().display()); +- assert!(home().exists()); ++ println!("home: {}", self::home().display()); ++ assert!(self::home().exists()); + +- println!("shell: {}", shell().display()); +- assert!(shell().exists()); ++ println!("shell: {}", self::shell().display()); ++ assert!(self::home().exists()); + } +diff --git a/syscare-common/src/os_str/iter.rs b/syscare-common/src/os_str/iter.rs +index db48771..2fa5d3b 100644 +--- a/syscare-common/src/os_str/iter.rs ++++ b/syscare-common/src/os_str/iter.rs +@@ -44,7 +44,7 @@ impl Iterator for CharIndices<'_> { + } + None => { + // Unable to parse utf-8 char, fallback to byte +- let result = (self.front_idx, char_bytes[0] as char); ++ let result = (self.front_idx, char::from(char_bytes[0])); + self.front_idx += 1; + + Some(result) +@@ -68,7 +68,13 @@ impl DoubleEndedIterator for CharIndices<'_> { + None => { + // Unable to parse utf-8 char, fallback to byte + self.back_idx -= 1; +- Some((self.back_idx, *char_bytes.last().unwrap() as char)) ++ Some(( ++ self.back_idx, ++ char_bytes ++ .last() ++ .map(|b| char::from(*b)) ++ .unwrap_or_default(), ++ )) + } + } + } +diff --git a/syscare-common/src/os_str/pattern.rs b/syscare-common/src/os_str/pattern.rs +index 6e0c1f0..fe15c18 100644 +--- a/syscare-common/src/os_str/pattern.rs ++++ b/syscare-common/src/os_str/pattern.rs +@@ -108,9 +108,10 @@ impl<'a> Searcher<'a> for CharLiteralSearcher<'a> { + match self.indices.next() { + Some((char_idx, c)) => { + let new_idx = char_idx + c.len_utf8(); +- match self.literals.contains(&c) { +- true => SearchStep::Match(char_idx, new_idx), +- false => SearchStep::Reject(char_idx, new_idx), ++ if self.literals.contains(&c) { ++ SearchStep::Match(char_idx, new_idx) ++ } else { ++ SearchStep::Reject(char_idx, new_idx) + } + } + None => SearchStep::Done, +@@ -123,9 +124,10 @@ impl<'a> ReverseSearcher<'a> for CharLiteralSearcher<'a> { + match self.indices.next_back() { + Some((char_idx, c)) => { + let new_idx = char_idx + c.len_utf8(); +- match self.literals.contains(&c) { +- true => SearchStep::Match(char_idx, new_idx), +- false => SearchStep::Reject(char_idx, new_idx), ++ if self.literals.contains(&c) { ++ SearchStep::Match(char_idx, new_idx) ++ } else { ++ SearchStep::Reject(char_idx, new_idx) + } + } + None => SearchStep::Done, +@@ -161,9 +163,10 @@ impl<'a, P: FnMut(char) -> bool> Searcher<'a> for CharPredicateSearcher<'a, P> { + match self.indices.next() { + Some((char_idx, c)) => { + let new_idx = char_idx + c.len_utf8(); +- match (self.predicate)(c) { +- true => SearchStep::Match(char_idx, new_idx), +- false => SearchStep::Reject(char_idx, new_idx), ++ if (self.predicate)(c) { ++ SearchStep::Match(char_idx, new_idx) ++ } else { ++ SearchStep::Reject(char_idx, new_idx) + } + } + None => SearchStep::Done, +@@ -176,9 +179,10 @@ impl<'a, P: FnMut(char) -> bool> ReverseSearcher<'a> for CharPredicateSearcher<' + match self.indices.next_back() { + Some((char_idx, c)) => { + let new_idx = char_idx + c.len_utf8(); +- match (self.predicate)(c) { +- true => SearchStep::Match(char_idx, new_idx), +- false => SearchStep::Reject(char_idx, new_idx), ++ if (self.predicate)(c) { ++ SearchStep::Match(char_idx, new_idx) ++ } else { ++ SearchStep::Reject(char_idx, new_idx) + } + } + None => SearchStep::Done, +diff --git a/syscare-common/src/os_str/utf8.rs b/syscare-common/src/os_str/utf8.rs +index 9a90bc0..8341df2 100644 +--- a/syscare-common/src/os_str/utf8.rs ++++ b/syscare-common/src/os_str/utf8.rs +@@ -46,7 +46,7 @@ pub fn next_valid_char(bytes: &[u8]) -> Option<(usize, char)> { + } + + let mut code = match char_width { +- 1 => return Some((1, first_byte as char)), ++ 1 => return Some((1, char::from(first_byte))), + 2 => u32::from(first_byte & 0x1F) << 0x6, + 3 => u32::from(first_byte & 0x0F) << 0xC, + 4 => u32::from(first_byte & 0x07) << 0x12, +diff --git a/syscare-common/src/process/child.rs b/syscare-common/src/process/child.rs +index 4ce6664..0e8cf54 100644 +--- a/syscare-common/src/process/child.rs ++++ b/syscare-common/src/process/child.rs +@@ -20,7 +20,7 @@ use std::{ + thread::JoinHandle, + }; + +-use anyhow::{ensure, Context, Result}; ++use anyhow::{anyhow, ensure, Context, Result}; + use log::trace; + + use super::{Stdio, StdioLevel}; +@@ -81,7 +81,9 @@ impl Child { + pub fn wait_with_output(&mut self) -> Result { + let stdio_thread = self.capture_stdio()?; + let status = self.wait()?; +- let (stdout, stderr) = stdio_thread.join().expect("Failed to join stdio thread"); ++ let (stdout, stderr) = stdio_thread ++ .join() ++ .map_err(|_| anyhow!("Failed to join stdio thread"))?; + + Ok(Output { + status, +diff --git a/syscare-common/src/process/stdio.rs b/syscare-common/src/process/stdio.rs +index fca944f..450019a 100644 +--- a/syscare-common/src/process/stdio.rs ++++ b/syscare-common/src/process/stdio.rs +@@ -90,7 +90,7 @@ impl Iterator for StdioReader { + match self.select.select().context("Failed to select stdio") { + Ok(result) => { + let stdio_map = &mut self.stdio_map; +- let outputs = result.into_iter().filter_map(|fd| match fd { ++ let outputs = result.into_iter().filter_map(|income| match income { + SelectResult::Readable(fd) => { + stdio_map.get_mut(&fd).and_then(|stdio| match stdio { + StdioLines::Stdout(lines) => { +diff --git a/syscare/build.rs b/syscare/build.rs +index 45eb14a..826ba22 100644 +--- a/syscare/build.rs ++++ b/syscare/build.rs +@@ -12,26 +12,25 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{env, process::Command}; ++use std::{env, ffi::OsStr, os::unix::ffi::OsStrExt, process::Command}; + + fn rewrite_version() { +- const ENV_VERSION_NAME: &str = "BUILD_VERSION"; +- const PKG_VERSION_NAME: &str = "CARGO_PKG_VERSION"; ++ const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); ++ const ENV_VERSION: Option<&str> = option_env!("BUILD_VERSION"); + +- let version = env::var(ENV_VERSION_NAME).unwrap_or_else(|_| { +- let pkg_version = env::var(PKG_VERSION_NAME).expect("Failed to fetch package version"); +- let git_output = Command::new("git") +- .args(["rev-parse", "--short", "HEAD"]) +- .output() +- .map(|output| String::from_utf8(output.stdout).expect("Failed to fetch git version")); +- +- match git_output { +- Ok(git_version) => format!("{}-g{}", pkg_version, git_version), +- Err(_) => pkg_version, +- } +- }); +- +- println!("cargo:rustc-env={}={}", PKG_VERSION_NAME, version); ++ println!( ++ "cargo:rustc-env=CARGO_PKG_VERSION={}", ++ ENV_VERSION.map(String::from).unwrap_or_else(|| { ++ Command::new("git") ++ .args(["rev-parse", "--short", "HEAD"]) ++ .output() ++ .map(|output| { ++ let git_version = OsStr::from_bytes(&output.stdout).to_string_lossy(); ++ format!("{}-g{}", PKG_VERSION, git_version) ++ }) ++ .unwrap_or_else(|_| PKG_VERSION.to_string()) ++ }) ++ ); + } + + fn main() { +diff --git a/syscare/src/executor/patch.rs b/syscare/src/executor/patch.rs +index 1c4109b..98e719d 100644 +--- a/syscare/src/executor/patch.rs ++++ b/syscare/src/executor/patch.rs +@@ -14,7 +14,7 @@ + + use std::{fmt::Write, path::PathBuf}; + +-use anyhow::{anyhow, Error, Result}; ++use anyhow::{anyhow, Context, Error, Result}; + use log::info; + + use syscare_abi::{PackageInfo, PatchInfo, PatchListRecord, PatchStateRecord}; +@@ -39,7 +39,7 @@ impl PatchCommandExecutor { + fn check_error(mut error_list: Vec) -> Result<()> { + match error_list.len() { + 0 => Ok(()), +- 1 => Err(error_list.pop().unwrap()), ++ 1 => Err(error_list.pop().context("Invalid error")?), + _ => { + let mut err_msg = String::new(); + for (idx, e) in error_list.into_iter().enumerate() { +diff --git a/syscare/src/main.rs b/syscare/src/main.rs +index dea5717..754307f 100644 +--- a/syscare/src/main.rs ++++ b/syscare/src/main.rs +@@ -62,9 +62,10 @@ impl SyscareCLI { + let args = Arguments::new()?; + + // Initialize logger +- let log_level_max = match args.verbose { +- false => LevelFilter::Info, +- true => LevelFilter::Trace, ++ let log_level_max = if args.verbose { ++ LevelFilter::Trace ++ } else { ++ LevelFilter::Info + }; + let log_spec = LogSpecification::builder().default(log_level_max).build(); + let logger = Logger::with(log_spec) +@@ -91,10 +92,9 @@ impl SyscareCLI { + + debug!("Initializing command executors..."); + let patch_lock_file = self.args.work_dir.join(PATCH_OP_LOCK_NAME); +- let executors = vec![ +- Box::new(BuildCommandExecutor) as Box, +- Box::new(PatchCommandExecutor::new(patch_proxy, patch_lock_file)) +- as Box, ++ let executors: Vec> = vec![ ++ Box::new(BuildCommandExecutor), ++ Box::new(PatchCommandExecutor::new(patch_proxy, patch_lock_file)), + ]; + + let command = &self.args.command; +diff --git a/syscare/src/rpc/remote.rs b/syscare/src/rpc/remote.rs +index bd4c598..f2c9244 100644 +--- a/syscare/src/rpc/remote.rs ++++ b/syscare/src/rpc/remote.rs +@@ -61,27 +61,22 @@ impl RpcRemote { + impl RpcRemote { + fn parse_error(&self, error: Error) -> anyhow::Error { + match error { +- Error::Transport(e) => { ++ Error::Transport(err) => { + anyhow!( + "Cannot connect to syscare daemon at unix://{}, {}", + self.socket.display(), +- e.source() ++ err.source() + .map(|e| e.to_string()) + .unwrap_or_else(|| "Connection timeout".to_string()) + ) + } +- Error::Json(e) => { +- debug!("Json parse error: {:?}", e); ++ Error::Json(err) => { ++ debug!("Json parse error: {:?}", err); + anyhow!("Failed to parse response") + } +- Error::Rpc(ref e) => match e.message == "Method not found" { +- true => { +- anyhow!("Method is unimplemented") +- } +- false => { +- anyhow!("{}", e.message) +- } +- }, ++ Error::Rpc(err) => { ++ anyhow!("{}", err.message) ++ } + _ => { + debug!("{:?}", error); + anyhow!("Response is invalid") +diff --git a/syscared/build.rs b/syscared/build.rs +index ea4bee7..3a07aa1 100644 +--- a/syscared/build.rs ++++ b/syscared/build.rs +@@ -12,26 +12,25 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{env, process::Command}; ++use std::{env, ffi::OsStr, os::unix::ffi::OsStrExt, process::Command}; + + fn rewrite_version() { +- const ENV_VERSION_NAME: &str = "BUILD_VERSION"; +- const PKG_VERSION_NAME: &str = "CARGO_PKG_VERSION"; ++ const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); ++ const ENV_VERSION: Option<&str> = option_env!("BUILD_VERSION"); + +- let version = env::var(ENV_VERSION_NAME).unwrap_or_else(|_| { +- let pkg_version = env::var(PKG_VERSION_NAME).expect("Failed to fetch package version"); +- let git_output = Command::new("git") +- .args(["rev-parse", "--short", "HEAD"]) +- .output() +- .map(|output| String::from_utf8(output.stdout).expect("Failed to fetch git version")); +- +- match git_output { +- Ok(git_version) => format!("{}-g{}", pkg_version, git_version), +- Err(_) => pkg_version, +- } +- }); +- +- println!("cargo:rustc-env={}={}", PKG_VERSION_NAME, version); ++ println!( ++ "cargo:rustc-env=CARGO_PKG_VERSION={}", ++ ENV_VERSION.map(String::from).unwrap_or_else(|| { ++ Command::new("git") ++ .args(["rev-parse", "--short", "HEAD"]) ++ .output() ++ .map(|output| { ++ let git_version = OsStr::from_bytes(&output.stdout).to_string_lossy(); ++ format!("{}-g{}", PKG_VERSION, git_version) ++ }) ++ .unwrap_or_else(|_| PKG_VERSION.to_string()) ++ }) ++ ); + } + + fn main() { +diff --git a/syscared/src/main.rs b/syscared/src/main.rs +index f13a9f8..42e9564 100644 +--- a/syscared/src/main.rs ++++ b/syscared/src/main.rs +@@ -129,9 +129,10 @@ impl Daemon { + + // Initialize logger + let max_level = args.log_level; +- let stdout_level = match args.daemon { +- true => LevelFilter::Off, +- false => max_level, ++ let stdout_level = if args.daemon { ++ LevelFilter::Off ++ } else { ++ max_level + }; + let log_spec = LogSpecification::builder().default(max_level).build(); + let file_spec = FileSpec::default() +@@ -210,9 +211,10 @@ impl Daemon { + + fs::set_permissions( + &socket_file, +- match socket_owner.as_raw() == socket_group.as_raw() { +- true => Permissions::from_mode(SOCKET_FILE_PERM_STRICT), +- false => Permissions::from_mode(SOCKET_FILE_PERM), ++ if socket_owner.as_raw() == socket_group.as_raw() { ++ Permissions::from_mode(SOCKET_FILE_PERM_STRICT) ++ } else { ++ Permissions::from_mode(SOCKET_FILE_PERM) + }, + )?; + +diff --git a/syscared/src/patch/driver/kpatch/sys.rs b/syscared/src/patch/driver/kpatch/sys.rs +index ea6b68f..22efa93 100644 +--- a/syscared/src/patch/driver/kpatch/sys.rs ++++ b/syscared/src/patch/driver/kpatch/sys.rs +@@ -92,7 +92,7 @@ pub fn apply_patch(patch: &KernelPatch) -> Result<()> { + CString::new("")?.as_c_str(), + kmod::ModuleInitFlags::MODULE_INIT_IGNORE_VERMAGIC, + ) +- .map_err(|e| anyhow!("Kpatch: {}", std::io::Error::from_raw_os_error(e as i32))) ++ .map_err(|e| anyhow!("Kpatch: {}", std::io::Error::from(e))) + } + + pub fn remove_patch(patch: &KernelPatch) -> Result<()> { +@@ -105,7 +105,7 @@ pub fn remove_patch(patch: &KernelPatch) -> Result<()> { + patch.module_name.to_cstring()?.as_c_str(), + kmod::DeleteModuleFlags::O_NONBLOCK, + ) +- .map_err(|e| anyhow!("Kpatch: {}", std::io::Error::from_raw_os_error(e as i32))) ++ .map_err(|e| anyhow!("Kpatch: {}", std::io::Error::from(e))) + } + + pub fn active_patch(patch: &KernelPatch) -> Result<()> { +diff --git a/syscared/src/patch/driver/mod.rs b/syscared/src/patch/driver/mod.rs +index d64c2d4..7a57579 100644 +--- a/syscared/src/patch/driver/mod.rs ++++ b/syscared/src/patch/driver/mod.rs +@@ -39,15 +39,15 @@ pub struct PatchDriver { + impl PatchDriver { + fn check_conflict_functions(&self, patch: &Patch) -> Result<()> { + match patch { +- Patch::KernelPatch(patch) => self.kpatch.check_conflict_functions(patch), +- Patch::UserPatch(patch) => self.upatch.check_conflict_functions(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.check_conflict_functions(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.check_conflict_functions(upatch), + } + } + + fn check_override_functions(&self, patch: &Patch) -> Result<()> { + match patch { +- Patch::KernelPatch(patch) => self.kpatch.check_override_functions(patch), +- Patch::UserPatch(patch) => self.upatch.check_override_functions(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.check_override_functions(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.check_override_functions(upatch), + } + } + } +@@ -71,8 +71,8 @@ impl PatchDriver { + /// Fetch and return the patch status. + pub fn patch_status(&self, patch: &Patch) -> Result { + match patch { +- Patch::KernelPatch(patch) => self.kpatch.status(patch), +- Patch::UserPatch(patch) => self.upatch.status(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.status(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.status(upatch), + } + .with_context(|| format!("Failed to get patch '{}' status", patch)) + } +@@ -84,8 +84,8 @@ impl PatchDriver { + return Ok(()); + } + match patch { +- Patch::KernelPatch(patch) => self.kpatch.check(patch), +- Patch::UserPatch(patch) => self.upatch.check(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.check(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.check(upatch), + } + .with_context(|| format!("Patch '{}' is not patchable", patch)) + } +@@ -104,8 +104,8 @@ impl PatchDriver { + /// After this action, the patch status would be changed to 'DEACTIVED'. + pub fn apply_patch(&mut self, patch: &Patch) -> Result<()> { + match patch { +- Patch::KernelPatch(patch) => self.kpatch.apply(patch), +- Patch::UserPatch(patch) => self.upatch.apply(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.apply(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.apply(upatch), + } + .with_context(|| format!("Failed to apply patch '{}'", patch)) + } +@@ -114,8 +114,8 @@ impl PatchDriver { + /// After this action, the patch status would be changed to 'NOT-APPLIED'. + pub fn remove_patch(&mut self, patch: &Patch) -> Result<()> { + match patch { +- Patch::KernelPatch(patch) => self.kpatch.remove(patch), +- Patch::UserPatch(patch) => self.upatch.remove(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.remove(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.remove(upatch), + } + .with_context(|| format!("Failed to remove patch '{}'", patch)) + } +@@ -127,8 +127,8 @@ impl PatchDriver { + self.check_conflict_functions(patch)?; + } + match patch { +- Patch::KernelPatch(patch) => self.kpatch.active(patch), +- Patch::UserPatch(patch) => self.upatch.active(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.active(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.active(upatch), + } + .with_context(|| format!("Failed to active patch '{}'", patch)) + } +@@ -140,8 +140,8 @@ impl PatchDriver { + self.check_override_functions(patch)?; + } + match patch { +- Patch::KernelPatch(patch) => self.kpatch.deactive(patch), +- Patch::UserPatch(patch) => self.upatch.deactive(patch), ++ Patch::KernelPatch(kpatch) => self.kpatch.deactive(kpatch), ++ Patch::UserPatch(upatch) => self.upatch.deactive(upatch), + } + .with_context(|| format!("Failed to deactive patch '{}'", patch)) + } +diff --git a/syscared/src/patch/driver/upatch/mod.rs b/syscared/src/patch/driver/upatch/mod.rs +index 66eecf5..73ef94e 100644 +--- a/syscared/src/patch/driver/upatch/mod.rs ++++ b/syscared/src/patch/driver/upatch/mod.rs +@@ -227,8 +227,8 @@ impl UserPatchDriver { + Err(_) => return, + }; + +- let mut target_map = target_map.write(); +- let patch_target = match target_map.get_mut(target_elf) { ++ let mut patch_target_map = target_map.write(); ++ let patch_target = match patch_target_map.get_mut(target_elf) { + Some(target) => target, + None => return, + }; +diff --git a/syscared/src/patch/manager.rs b/syscared/src/patch/manager.rs +index f633567..d156e4a 100644 +--- a/syscared/src/patch/manager.rs ++++ b/syscared/src/patch/manager.rs +@@ -246,12 +246,11 @@ impl PatchManager { + + debug!("Reading patch status..."); + let status_file = &self.patch_status_file; +- let status_map: HashMap = match status_file.exists() { +- true => serde::deserialize(status_file).context("Failed to read patch status")?, +- false => { +- warn!("Cannot find patch status file"); +- return Ok(()); +- } ++ let status_map: HashMap = if status_file.exists() { ++ serde::deserialize(status_file).context("Failed to read patch status")? ++ } else { ++ warn!("Cannot find patch status file"); ++ return Ok(()); + }; + + /* +@@ -301,7 +300,7 @@ impl PatchManager { + pub fn rescan_patches(&mut self) -> Result<()> { + self.patch_map = Self::scan_patches(&self.patch_install_dir)?; + +- let status_keys = self.status_map.keys().cloned().collect::>(); ++ let status_keys = self.status_map.keys().copied().collect::>(); + for patch_uuid in status_keys { + if !self.patch_map.contains_key(&patch_uuid) { + trace!("Patch '{}' was removed, remove its status", patch_uuid); +@@ -362,9 +361,9 @@ impl PatchManager { + let mut patch_map = IndexMap::new(); + + info!("Scanning patches from {}...", directory.as_ref().display()); +- for patch_root in fs::list_dirs(directory, TRAVERSE_OPTION)? { +- let resolve_result = PatchResolver::resolve_patch(&patch_root) +- .with_context(|| format!("Failed to resolve patch from {}", patch_root.display())); ++ for patch_dir in fs::list_dirs(directory, TRAVERSE_OPTION)? { ++ let resolve_result = PatchResolver::resolve_patch(&patch_dir) ++ .with_context(|| format!("Failed to resolve patch from {}", patch_dir.display())); + match resolve_result { + Ok(patches) => { + for patch in patches { +diff --git a/syscared/src/patch/monitor.rs b/syscared/src/patch/monitor.rs +index 1798781..c793600 100644 +--- a/syscared/src/patch/monitor.rs ++++ b/syscared/src/patch/monitor.rs +@@ -44,13 +44,13 @@ impl PatchMonitor { + patch_root: P, + patch_manager: Arc>, + ) -> Result { +- let patch_root = patch_root.as_ref().join(PATCH_INSTALL_DIR); ++ let patch_install_dir = patch_root.as_ref().join(PATCH_INSTALL_DIR); + + let inotify = Arc::new(Mutex::new(Some({ + let mut inotify = Inotify::init().context("Failed to initialize inotify")?; + inotify + .add_watch( +- &patch_root, ++ &patch_install_dir, + WatchMask::CREATE | WatchMask::DELETE | WatchMask::ONLYDIR, + ) + .context("Failed to monitor patch directory")?; +@@ -59,7 +59,7 @@ impl PatchMonitor { + }))); + + let monitor_thread = MonitorThread { +- patch_root, ++ patch_root: patch_install_dir, + inotify: inotify.clone(), + patch_manager, + } +diff --git a/syscared/src/patch/resolver/kpatch.rs b/syscared/src/patch/resolver/kpatch.rs +index 524482e..7946c42 100644 +--- a/syscared/src/patch/resolver/kpatch.rs ++++ b/syscared/src/patch/resolver/kpatch.rs +@@ -100,8 +100,6 @@ mod ffi { + } + } + +-use ffi::*; +- + const KPATCH_FUNCS_SECTION: &str = ".kpatch.funcs"; + const KPATCH_STRINGS_SECTION: &str = ".kpatch.strings"; + +@@ -130,9 +128,9 @@ impl KpatchResolverImpl { + + // Resolve patch functions + let patch_functions = &mut patch.functions; +- let kpatch_function_slice = object::slice_from_bytes::( ++ let kpatch_function_slice = object::slice_from_bytes::( + function_data, +- function_data.len() / KPATCH_FUNCTION_SIZE, ++ function_data.len() / ffi::KPATCH_FUNCTION_SIZE, + ) + .map(|(f, _)| f) + .map_err(|_| anyhow!("Invalid data format")) +@@ -150,13 +148,13 @@ impl KpatchResolverImpl { + } + + // Relocate patch functions +- for relocation in KpatchRelocationIterator::new(function_section.relocations()) { ++ for relocation in ffi::KpatchRelocationIterator::new(function_section.relocations()) { + let (name_reloc_offset, name_reloc) = relocation.name; + let (object_reloc_offset, obj_reloc) = relocation.object; + + // Relocate patch function name +- let name_index = +- (name_reloc_offset as usize - KPATCH_FUNCTION_OFFSET) / KPATCH_FUNCTION_SIZE; ++ let name_index = (name_reloc_offset as usize - ffi::KPATCH_FUNCTION_OFFSET) ++ / ffi::KPATCH_FUNCTION_SIZE; + let name_function = patch_functions + .get_mut(name_index) + .context("Failed to find patch function")?; +@@ -168,8 +166,8 @@ impl KpatchResolverImpl { + name_function.name = name_string; + + // Relocate patch function object +- let object_index = +- (object_reloc_offset as usize - KPATCH_OBJECT_OFFSET) / KPATCH_FUNCTION_SIZE; ++ let object_index = (object_reloc_offset as usize - ffi::KPATCH_OBJECT_OFFSET) ++ / ffi::KPATCH_FUNCTION_SIZE; + let object_function = patch_functions + .get_mut(object_index) + .context("Failed to find patch function")?; +diff --git a/syscared/src/patch/resolver/mod.rs b/syscared/src/patch/resolver/mod.rs +index 80e26ea..7c4a504 100644 +--- a/syscared/src/patch/resolver/mod.rs ++++ b/syscared/src/patch/resolver/mod.rs +@@ -38,8 +38,8 @@ pub trait PatchResolverImpl { + pub struct PatchResolver; + + impl PatchResolver { +- pub fn resolve_patch>(patch_root: P) -> Result> { +- let patch_root = patch_root.as_ref(); ++ pub fn resolve_patch>(directory: P) -> Result> { ++ let patch_root = directory.as_ref(); + let patch_info = Arc::new( + serde::deserialize_with_magic::( + patch_root.join(PATCH_INFO_FILE_NAME), +@@ -47,9 +47,9 @@ impl PatchResolver { + ) + .context("Failed to resolve patch metadata")?, + ); +- let resolver = match patch_info.kind { +- PatchType::UserPatch => &UpatchResolverImpl as &dyn PatchResolverImpl, +- PatchType::KernelPatch => &KpatchResolverImpl as &dyn PatchResolverImpl, ++ let resolver: &dyn PatchResolverImpl = match patch_info.kind { ++ PatchType::UserPatch => &UpatchResolverImpl, ++ PatchType::KernelPatch => &KpatchResolverImpl, + }; + + let mut patch_list = Vec::with_capacity(patch_info.entities.len()); +diff --git a/syscared/src/patch/resolver/upatch.rs b/syscared/src/patch/resolver/upatch.rs +index 5df11db..cb06c24 100644 +--- a/syscared/src/patch/resolver/upatch.rs ++++ b/syscared/src/patch/resolver/upatch.rs +@@ -85,8 +85,6 @@ mod ffi { + } + } + +-use ffi::*; +- + const UPATCH_FUNCS_SECTION: &str = ".upatch.funcs"; + const UPATCH_STRINGS_SECTION: &str = ".upatch.strings"; + +@@ -115,9 +113,9 @@ impl UpatchResolverImpl { + + // Resolve patch functions + let patch_functions = &mut patch.functions; +- let upatch_function_slice = object::slice_from_bytes::( ++ let upatch_function_slice = object::slice_from_bytes::( + function_data, +- function_data.len() / UPATCH_FUNCTION_SIZE, ++ function_data.len() / ffi::UPATCH_FUNCTION_SIZE, + ) + .map(|(f, _)| f) + .map_err(|_| anyhow!("Invalid data format")) +@@ -134,11 +132,11 @@ impl UpatchResolverImpl { + } + + // Relocate patch functions +- for relocation in UpatchRelocationIterator::new(function_section.relocations()) { ++ for relocation in ffi::UpatchRelocationIterator::new(function_section.relocations()) { + let (name_reloc_offset, name_reloc) = relocation.name; + +- let name_index = +- (name_reloc_offset as usize - UPATCH_FUNCTION_OFFSET) / UPATCH_FUNCTION_SIZE; ++ let name_index = (name_reloc_offset as usize - ffi::UPATCH_FUNCTION_OFFSET) ++ / ffi::UPATCH_FUNCTION_SIZE; + let name_function = patch_functions + .get_mut(name_index) + .context("Failed to find patch function")?; +diff --git a/syscared/src/rpc/skeleton_impl/patch.rs b/syscared/src/rpc/skeleton_impl/patch.rs +index b009d46..8216428 100644 +--- a/syscared/src/rpc/skeleton_impl/patch.rs ++++ b/syscared/src/rpc/skeleton_impl/patch.rs +@@ -96,9 +96,10 @@ impl PatchSkeleton for PatchSkeletonImpl { + format!("Apply patch '{}'", identifier), + self.patch_manager.clone(), + PatchManager::apply_patch, +- match force { +- false => PatchOpFlag::Normal, +- true => PatchOpFlag::Force, ++ if force { ++ PatchOpFlag::Force ++ } else { ++ PatchOpFlag::Normal + }, + identifier, + ) +@@ -131,9 +132,10 @@ impl PatchSkeleton for PatchSkeletonImpl { + format!("Active patch '{}'", identifier), + self.patch_manager.clone(), + PatchManager::active_patch, +- match force { +- false => PatchOpFlag::Normal, +- true => PatchOpFlag::Force, ++ if force { ++ PatchOpFlag::Force ++ } else { ++ PatchOpFlag::Normal + }, + identifier, + ) +diff --git a/upatch-build/build.rs b/upatch-build/build.rs +index 8cbb156..9ef3a36 100644 +--- a/upatch-build/build.rs ++++ b/upatch-build/build.rs +@@ -12,26 +12,25 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{env, process::Command}; ++use std::{env, ffi::OsStr, os::unix::ffi::OsStrExt, process::Command}; + + fn rewrite_version() { +- const ENV_VERSION_NAME: &str = "BUILD_VERSION"; +- const PKG_VERSION_NAME: &str = "CARGO_PKG_VERSION"; ++ const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); ++ const ENV_VERSION: Option<&str> = option_env!("BUILD_VERSION"); + +- let version = env::var(ENV_VERSION_NAME).unwrap_or_else(|_| { +- let pkg_version = env::var(PKG_VERSION_NAME).expect("Failed to fetch package version"); +- let git_output = Command::new("git") +- .args(["rev-parse", "--short", "HEAD"]) +- .output() +- .map(|output| String::from_utf8(output.stdout).expect("Failed to fetch git version")); +- +- match git_output { +- Ok(git_version) => format!("{}-g{}", pkg_version, git_version), +- Err(_) => pkg_version, +- } +- }); +- +- println!("cargo:rustc-env={}={}", PKG_VERSION_NAME, version); ++ println!( ++ "cargo:rustc-env=CARGO_PKG_VERSION={}", ++ ENV_VERSION.map(String::from).unwrap_or_else(|| { ++ Command::new("git") ++ .args(["rev-parse", "--short", "HEAD"]) ++ .output() ++ .map(|output| { ++ let git_version = OsStr::from_bytes(&output.stdout).to_string_lossy(); ++ format!("{}-g{}", PKG_VERSION, git_version) ++ }) ++ .unwrap_or_else(|_| PKG_VERSION.to_string()) ++ }) ++ ); + } + + fn main() { +diff --git a/upatch-build/src/args.rs b/upatch-build/src/args.rs +index c3b6f48..04790c1 100644 +--- a/upatch-build/src/args.rs ++++ b/upatch-build/src/args.rs +@@ -113,13 +113,15 @@ impl Arguments { + args.name.push("-"); + } + +- args.elf_dir = match args.elf_dir.as_os_str().is_empty() { +- false => fs::normalize(&args.elf_dir)?, +- true => args.source_dir.clone(), ++ args.elf_dir = if args.elf_dir.as_os_str().is_empty() { ++ args.source_dir.clone() ++ } else { ++ fs::normalize(&args.elf_dir)? + }; +- args.object_dir = match args.object_dir.as_os_str().is_empty() { +- false => fs::normalize(&args.object_dir)?, +- true => args.source_dir.clone(), ++ args.object_dir = if args.object_dir.as_os_str().is_empty() { ++ args.source_dir.clone() ++ } else { ++ fs::normalize(&args.object_dir)? + }; + + for elf_path in &mut args.elf { +diff --git a/upatch-build/src/build_root.rs b/upatch-build/src/build_root.rs +index 556231d..5915bbc 100644 +--- a/upatch-build/src/build_root.rs ++++ b/upatch-build/src/build_root.rs +@@ -26,8 +26,8 @@ pub struct BuildRoot { + } + + impl BuildRoot { +- pub fn new>(path: P) -> Result { +- let path = path.as_ref().to_path_buf(); ++ pub fn new>(directory: P) -> Result { ++ let path = directory.as_ref().to_path_buf(); + let original_dir = path.join("original"); + let patched_dir = path.join("patched"); + let temp_dir = path.join("temp"); +diff --git a/upatch-build/src/compiler.rs b/upatch-build/src/compiler.rs +index 7778f0b..b4866bd 100644 +--- a/upatch-build/src/compiler.rs ++++ b/upatch-build/src/compiler.rs +@@ -178,23 +178,28 @@ impl Compiler { + let mut result = Vec::new(); + + for compiler in compilers { +- let compiler = compiler.as_ref(); +- let compiler_name = compiler ++ let compiler_path = compiler.as_ref(); ++ let compiler_name = compiler_path + .file_name() + .context("Failed to parse compiler name")?; + + let output_dir = temp_dir.as_ref().join(compiler_name); + fs::create_dir_all(&output_dir)?; + +- debug!("- Checking {}", compiler.display()); +- let assembler_name = +- Self::get_component_name(compiler, ASSEMBLER_NAME).with_context(|| { +- format!("Failed to get assembler name of {}", compiler.display()) ++ debug!("- Checking {}", compiler_path.display()); ++ let assembler_name = Self::get_component_name(compiler_path, ASSEMBLER_NAME) ++ .with_context(|| { ++ format!( ++ "Failed to get assembler name of {}", ++ compiler_path.display() ++ ) ++ })?; ++ let linker_name = ++ Self::get_component_name(compiler_path, LINKER_NAME).with_context(|| { ++ format!("Failed to get linker name of {}", compiler_path.display()) + })?; +- let linker_name = Self::get_component_name(compiler, LINKER_NAME) +- .with_context(|| format!("Failed to get linker name of {}", compiler.display()))?; + +- let path = compiler.to_path_buf(); ++ let path = compiler_path.to_path_buf(); + let assembler = which(assembler_name.trim()).with_context(|| { + format!("Cannot find assembler {}", assembler_name.to_string_lossy()) + })?; +@@ -202,17 +207,17 @@ impl Compiler { + .with_context(|| format!("Cannot find linker {}", linker_name.to_string_lossy()))?; + let versions = IndexSet::new(); + +- let mut compiler = Self { ++ let mut instance = Self { + path, + assembler, + linker, + versions, + }; +- compiler ++ instance + .fetch_versions(output_dir) + .context("Failed to fetch supported versions")?; + +- result.push(compiler); ++ result.push(instance); + } + + Ok(result) +diff --git a/upatch-build/src/dwarf/mod.rs b/upatch-build/src/dwarf/mod.rs +index 35f359e..6a91f7c 100644 +--- a/upatch-build/src/dwarf/mod.rs ++++ b/upatch-build/src/dwarf/mod.rs +@@ -49,9 +49,9 @@ pub struct CompileUnit { + pub struct Dwarf; + + impl Dwarf { +- pub fn parse>(elf: P) -> Result> { ++ pub fn parse>(file_path: P) -> Result> { + // use mmap here, but depend on some devices +- let elf = elf.as_ref(); ++ let elf = file_path.as_ref(); + let file = std::fs::File::open(elf)?; + let mmap = unsafe { memmap2::Mmap::map(&file)? }; + +@@ -88,6 +88,8 @@ impl Dwarf { + file: &File, + section: &Section, + ) { ++ const INVALID_SECTION_NAME: &str = ".invalid"; ++ + for (offset64, mut relocation) in section.relocations() { + let offset = offset64 as usize; + if offset as u64 != offset64 { +@@ -104,8 +106,7 @@ impl Dwarf { + } + Err(_) => { + trace!("Relocation with invalid symbol for section {} at offset 0x{:08x}", +- section.name().unwrap(), +- offset ++ section.name().unwrap_or(INVALID_SECTION_NAME), offset + ); + } + } +@@ -113,7 +114,7 @@ impl Dwarf { + if relocations.insert(offset, relocation).is_some() { + trace!( + "Multiple relocations for section {} at offset 0x{:08x}", +- section.name().unwrap(), ++ section.name().unwrap_or(INVALID_SECTION_NAME), + offset + ); + } +@@ -121,7 +122,7 @@ impl Dwarf { + _ => { + trace!( + "Unsupported relocation for section {} at offset 0x{:08x}", +- section.name().unwrap(), ++ section.name().unwrap_or(INVALID_SECTION_NAME), + offset + ); + } +@@ -136,12 +137,12 @@ impl Dwarf { + arena_data: &'arena Arena>, + arena_relocations: &'arena Arena>, + ) -> Result>> { +- let mut relocations = IndexMap::new(); ++ let mut relocation_map = IndexMap::new(); + let name = Some(id.name()); +- let data = match name.and_then(|name| file.section_by_name(name)) { ++ let data = match name.and_then(|section_name| file.section_by_name(section_name)) { + Some(ref section) => { + // DWO sections never have relocations, so don't bother. +- Self::add_relocations(&mut relocations, file, section); ++ Self::add_relocations(&mut relocation_map, file, section); + section.uncompressed_data()? + } + // Use a non-zero capacity so that `ReaderOffsetId`s are unique. +@@ -150,7 +151,7 @@ impl Dwarf { + let data_ref = (*arena_data.alloc(data)).borrow(); + let reader = EndianSlice::new(data_ref, endian); + let section = reader; +- let relocations = (*arena_relocations.alloc(relocations)).borrow(); ++ let relocations = (*arena_relocations.alloc(relocation_map)).borrow(); + Ok(Relocate { + relocations, + section, +diff --git a/upatch-build/src/dwarf/relocate.rs b/upatch-build/src/dwarf/relocate.rs +index 2a6e393..e8c7cdf 100644 +--- a/upatch-build/src/dwarf/relocate.rs ++++ b/upatch-build/src/dwarf/relocate.rs +@@ -14,6 +14,7 @@ + + use std::borrow::Cow; + ++use gimli::ReaderOffset; + use indexmap::IndexMap; + use object::Relocation; + +@@ -28,10 +29,11 @@ impl<'a, R: gimli::Reader> Relocate<'a, R> { + pub fn relocate(&self, offset: usize, value: u64) -> u64 { + if let Some(relocation) = self.relocations.get(&offset) { + if relocation.kind() == object::RelocationKind::Absolute { +- return match relocation.has_implicit_addend() { ++ return if relocation.has_implicit_addend() { + // Use the explicit addend too, because it may have the symbol value. +- true => value.wrapping_add(relocation.addend() as u64), +- false => relocation.addend() as u64, ++ value.wrapping_add(relocation.addend() as u64) ++ } else { ++ relocation.addend() as u64 + }; + } + }; +@@ -52,19 +54,19 @@ impl<'a, R: gimli::Reader> gimli::Reader for Relocate<'a, R> { + fn read_length(&mut self, format: gimli::Format) -> gimli::Result { + let offset = self.reader.offset_from(&self.section); + let value = self.reader.read_length(format)?; +- ::from_u64(self.relocate(offset, value as u64)) ++ gimli::ReaderOffset::from_u64(self.relocate(offset, value.into_u64())) + } + + fn read_offset(&mut self, format: gimli::Format) -> gimli::Result { + let offset = self.reader.offset_from(&self.section); + let value = self.reader.read_offset(format)?; +- ::from_u64(self.relocate(offset, value as u64)) ++ gimli::ReaderOffset::from_u64(self.relocate(offset, value.into_u64())) + } + + fn read_sized_offset(&mut self, size: u8) -> gimli::Result { + let offset = self.reader.offset_from(&self.section); + let value = self.reader.read_sized_offset(size)?; +- ::from_u64(self.relocate(offset, value as u64)) ++ gimli::ReaderOffset::from_u64(self.relocate(offset, value.into_u64())) + } + + #[inline] +diff --git a/upatch-build/src/elf/header.rs b/upatch-build/src/elf/header.rs +index ad9f8fd..a4c4ca8 100644 +--- a/upatch-build/src/elf/header.rs ++++ b/upatch-build/src/elf/header.rs +@@ -48,10 +48,6 @@ pub trait HeaderWrite: OperateWrite { + fn set_e_ident(&mut self, e_ident: u128) { + self.set(offset_of!(FileHeader64, e_ident), e_ident) + } +- +- fn set_e_shnum(&mut self, e_shnum: u16) { +- self.set(offset_of!(FileHeader64, e_shnum), e_shnum) +- } + } + + #[repr(C)] +diff --git a/upatch-build/src/elf/read/elfs.rs b/upatch-build/src/elf/read/elfs.rs +index 11d57e3..52c5e6b 100644 +--- a/upatch-build/src/elf/read/elfs.rs ++++ b/upatch-build/src/elf/read/elfs.rs +@@ -19,10 +19,10 @@ use anyhow::bail; + use anyhow::Result; + use memmap2::{Mmap, MmapOptions}; + +-use super::super::*; +-use super::Header; +-use super::SectionHeaderTable; +-use super::SymbolHeaderTable; ++use super::{ ++ super::{check_elf, check_header, Endian, HeaderRead, SectionRead, SymbolHeader64, SHT_SYMTAB}, ++ Header, SectionHeaderTable, SymbolHeaderTable, ++}; + + #[derive(Debug)] + pub struct Elf { +@@ -61,7 +61,7 @@ impl Elf { + + pub fn symbols(&self) -> Result { + let sections = self.sections()?; +- for section in sections { ++ for section in sections.clone() { + if section.get_sh_type().eq(&SHT_SYMTAB) { + let offset = section.get_sh_offset() as usize; + let size_sum = section.get_sh_size() as usize; +diff --git a/upatch-build/src/elf/read/section.rs b/upatch-build/src/elf/read/section.rs +index a12c4f3..8f79c8b 100644 +--- a/upatch-build/src/elf/read/section.rs ++++ b/upatch-build/src/elf/read/section.rs +@@ -44,7 +44,7 @@ impl OperateRead for SectionHeader<'_> { + } + } + +-#[derive(Debug, Clone, Copy)] ++#[derive(Debug, Clone)] + pub struct SectionHeaderTable<'a> { + mmap: &'a Mmap, + endian: Endian, +@@ -86,16 +86,13 @@ impl<'a> Iterator for SectionHeaderTable<'a> { + type Item = SectionHeader<'a>; + + fn next(&mut self) -> Option { +- match self.count < self.num { +- true => { +- let offset = self.count * self.size + self.offset; +- self.count += 1; +- Some(SectionHeader::from(self.mmap, self.endian, offset)) +- } +- false => { +- self.count = 0; +- None +- } ++ if self.count < self.num { ++ let offset = self.count * self.size + self.offset; ++ self.count += 1; ++ Some(SectionHeader::from(self.mmap, self.endian, offset)) ++ } else { ++ self.count = 0; ++ None + } + } + } +diff --git a/upatch-build/src/elf/read/symbol.rs b/upatch-build/src/elf/read/symbol.rs +index 70f03e1..0c05cb6 100644 +--- a/upatch-build/src/elf/read/symbol.rs ++++ b/upatch-build/src/elf/read/symbol.rs +@@ -99,9 +99,10 @@ impl<'a> SymbolHeaderTable<'a> { + } + + pub fn reset(&mut self, n: usize) { +- match n < self.num { +- true => self.count = n, +- false => self.count = 0, ++ if n < self.num { ++ self.count = n; ++ } else { ++ self.count = 0; + } + } + } +@@ -110,21 +111,18 @@ impl<'a> Iterator for SymbolHeaderTable<'a> { + type Item = SymbolHeader<'a>; + + fn next(&mut self) -> Option { +- match self.count < self.num { +- true => { +- let offset = self.count * self.size + self.offset; +- self.count += 1; +- Some(SymbolHeader::from( +- self.mmap, +- self.endian, +- self.strtab, +- offset, +- )) +- } +- false => { +- self.count = 0; +- None +- } ++ if self.count < self.num { ++ let offset = self.count * self.size + self.offset; ++ self.count += 1; ++ Some(SymbolHeader::from( ++ self.mmap, ++ self.endian, ++ self.strtab, ++ offset, ++ )) ++ } else { ++ self.count = 0; ++ None + } + } + } +diff --git a/upatch-build/src/elf/write/elfs.rs b/upatch-build/src/elf/write/elfs.rs +index e41ad0f..9ce2847 100644 +--- a/upatch-build/src/elf/write/elfs.rs ++++ b/upatch-build/src/elf/write/elfs.rs +@@ -15,11 +15,13 @@ + use std::fs::{File, OpenOptions}; + use std::path::Path; + +-use anyhow::{bail, Result}; ++use anyhow::{bail, Context, Result}; + use memmap2::{Mmap, MmapOptions}; + +-use super::super::*; +-use super::{Header, SectionHeader, SymbolHeaderTable}; ++use super::{ ++ super::{check_elf, check_header, Endian, HeaderRead, SectionRead, SymbolHeader64, SHT_SYMTAB}, ++ Header, SectionHeader, SymbolHeaderTable, ++}; + + #[derive(Debug)] + pub struct Elf { +@@ -88,7 +90,7 @@ impl Elf { + return Ok(SymbolHeaderTable::from( + &self.file, + self.endian, +- self.strtab.as_ref().unwrap(), ++ self.strtab.as_ref().context("Invalid strtab")?, + offset, + size, + offset + size_sum, +diff --git a/upatch-build/src/elf/write/symbol.rs b/upatch-build/src/elf/write/symbol.rs +index 5946897..0a2d08a 100644 +--- a/upatch-build/src/elf/write/symbol.rs ++++ b/upatch-build/src/elf/write/symbol.rs +@@ -38,13 +38,12 @@ impl<'a> SymbolHeader<'a> { + } + + pub fn get_st_name(&mut self) -> &OsStr { +- match self.name.is_empty() { +- false => <&std::ffi::OsStr>::clone(&self.name), +- true => { +- let name_offset = self.get_st_name_offset() as usize; +- self.name = self.read_to_os_string(name_offset); +- self.name +- } ++ if !self.name.is_empty() { ++ self.name ++ } else { ++ let name_offset = self.get_st_name_offset() as usize; ++ self.name = self.read_to_os_string(name_offset); ++ self.name + } + } + } +@@ -120,22 +119,19 @@ impl<'a> Iterator for SymbolHeaderTable<'a> { + + fn next(&mut self) -> Option { + let offset = self.count * self.size + self.start; +- match offset < self.end { +- true => { +- self.count += 1; +- let mmap = unsafe { +- MmapOptions::new() +- .offset(offset as u64) +- .len(self.size) +- .map_mut(self.file) +- .unwrap() +- }; +- Some(SymbolHeader::from(mmap, self.endian, self.strtab)) +- } +- false => { +- self.count = 0; +- None ++ if offset < self.end { ++ self.count += 1; ++ unsafe { ++ MmapOptions::new() ++ .offset(offset as u64) ++ .len(self.size) ++ .map_mut(self.file) ++ .ok() ++ .map(|mmap_mut| SymbolHeader::from(mmap_mut, self.endian, self.strtab)) + } ++ } else { ++ self.count = 0; ++ None + } + } + } +diff --git a/upatch-build/src/file_relation.rs b/upatch-build/src/file_relation.rs +index 5a58d04..eedd7d8 100644 +--- a/upatch-build/src/file_relation.rs ++++ b/upatch-build/src/file_relation.rs +@@ -60,14 +60,14 @@ impl FileRelation { + P: AsRef, + Q: AsRef, + { +- let mut binaries = binaries.into_iter(); +- let mut debuginfos = debuginfos.into_iter(); ++ let mut binary_iter = binaries.into_iter(); ++ let mut debuginfo_iter = debuginfos.into_iter(); + +- while let (Some(binary), Some(debuginfo)) = (binaries.next(), debuginfos.next()) { +- let binary = Self::find_binary_file(binary)?; +- let debuginfo = debuginfo.as_ref().to_path_buf(); ++ while let (Some(binary), Some(debuginfo)) = (binary_iter.next(), debuginfo_iter.next()) { ++ let binary_file = Self::find_binary_file(binary)?; ++ let debuginfo_file = debuginfo.as_ref().to_path_buf(); + +- self.debuginfo_map.insert(binary, debuginfo); ++ self.debuginfo_map.insert(binary_file, debuginfo_file); + } + + Ok(()) +diff --git a/upatch-build/src/main.rs b/upatch-build/src/main.rs +index 769cc6c..5aefd73 100644 +--- a/upatch-build/src/main.rs ++++ b/upatch-build/src/main.rs +@@ -333,9 +333,10 @@ impl UpatchBuild { + let binary_name = binary + .file_name() + .with_context(|| format!("Failed to parse binary name of {}", binary.display()))?; +- let patch_name = match name.is_empty() { +- true => binary_name.to_os_string(), +- false => concat_os!(name, "-", binary_name), ++ let patch_name = if name.is_empty() { ++ binary_name.to_os_string() ++ } else { ++ concat_os!(name, "-", binary_name) + }; + let output_file = build_info.output_dir.join(&patch_name); + +@@ -393,11 +394,10 @@ impl UpatchBuild { + .context("Patch test failed")?; + + info!("Checking debuginfo version(s)"); +- match self.args.skip_compiler_check { +- false => { +- Self::check_debuginfo(&compilers, debuginfos).context("Debuginfo check failed")?; +- } +- true => warn!("Warning: Skipped compiler version check!"), ++ if self.args.skip_compiler_check { ++ warn!("Warning: Skipped compiler version check!") ++ } else { ++ Self::check_debuginfo(&compilers, debuginfos).context("Debuginfo check failed")?; + } + + let mut files = FileRelation::new(); +diff --git a/upatch-build/src/pattern_path.rs b/upatch-build/src/pattern_path.rs +index 4ef86e1..f468620 100644 +--- a/upatch-build/src/pattern_path.rs ++++ b/upatch-build/src/pattern_path.rs +@@ -40,22 +40,18 @@ pub fn glob>(path: P) -> std::io::Result> { + let mut path_clone = vec![]; + for p in &mut pathes { + let tmp = p.join(components[i]); +- match tmp.exists() { +- true => path_clone.push(tmp), +- false => { +- let all_pathes = match i == (components.len() - 1) { +- true => { +- fs::list_files(&p, fs::TraverseOptions { recursive: false }) +- } +- false => { +- fs::list_dirs(&p, fs::TraverseOptions { recursive: false }) +- } +- }?; +- for name in find_name(components[i].as_os_str(), all_pathes)? { +- path_clone.push(p.join(name)); +- } ++ if tmp.exists() { ++ path_clone.push(tmp); ++ } else { ++ let all_pathes = if i == (components.len() - 1) { ++ fs::list_files(&p, fs::TraverseOptions { recursive: false }) ++ } else { ++ fs::list_dirs(&p, fs::TraverseOptions { recursive: false }) ++ }?; ++ for name in find_name(components[i].as_os_str(), all_pathes)? { ++ path_clone.push(p.join(name)); + } +- }; ++ } + } + pathes = path_clone; + } +diff --git a/upatch-build/src/resolve.rs b/upatch-build/src/resolve.rs +index 58947c0..d579901 100644 +--- a/upatch-build/src/resolve.rs ++++ b/upatch-build/src/resolve.rs +@@ -17,19 +17,19 @@ use std::path::Path; + use anyhow::Result; + use log::trace; + +-use crate::elf::*; ++use crate::elf::{self, HeaderRead, HeaderWrite, SymbolRead, SymbolWrite}; + + pub fn resolve_upatch(patch: Q, debuginfo: P) -> Result<()> + where + P: AsRef, + Q: AsRef, + { +- let mut patch_elf = write::Elf::parse(patch)?; +- let debuginfo_elf = read::Elf::parse(debuginfo)?; ++ let mut patch_elf = elf::write::Elf::parse(patch)?; ++ let debuginfo_elf = elf::read::Elf::parse(debuginfo)?; + + let debuginfo_e_ident = debuginfo_elf.header()?.get_e_ident(); + let debuginfo_e_type = debuginfo_elf.header()?.get_e_type(); +- let ei_osabi = elf_ei_osabi(debuginfo_e_ident); ++ let ei_osabi = elf::elf_ei_osabi(debuginfo_e_ident); + + patch_elf.header()?.set_e_ident(debuginfo_e_ident); + +@@ -37,28 +37,29 @@ where + + for mut symbol in &mut patch_elf.symbols()? { + /* No need to handle section symbol */ +- let sym_info = symbol.get_st_info(); +- if elf_st_type(sym_info) == STT_SECTION { ++ let sym_st_info = symbol.get_st_info(); ++ if elf::elf_st_type(sym_st_info) == elf::STT_SECTION { + continue; + } + + let sym_other = symbol.get_st_other(); +- if sym_other & SYM_OTHER != 0 { ++ if sym_other & elf::SYM_OTHER != 0 { + // TODO: we can delete these symbol's section here. +- symbol.set_st_other(sym_other & !SYM_OTHER); ++ symbol.set_st_other(sym_other & !elf::SYM_OTHER); + match symbol.get_st_value() { +- 0 => symbol.set_st_shndx(SHN_UNDEF), +- _ => symbol.set_st_shndx(SHN_LIVEPATCH), ++ 0 => symbol.set_st_shndx(elf::SHN_UNDEF), ++ _ => symbol.set_st_shndx(elf::SHN_LIVEPATCH), + }; +- } else if symbol.get_st_shndx() == SHN_UNDEF { +- if elf_st_bind(sym_info) == STB_LOCAL { ++ } else if symbol.get_st_shndx() == elf::SHN_UNDEF { ++ if elf::elf_st_bind(sym_st_info) == elf::STB_LOCAL { + /* only partly resolved undefined symbol could have st_value */ + if symbol.get_st_value() != 0 { +- symbol.set_st_shndx(SHN_LIVEPATCH); ++ symbol.set_st_shndx(elf::SHN_LIVEPATCH); + } + } else { + __partial_resolve_patch(&mut symbol, debuginfo_syms, ei_osabi)?; + } ++ } else { /* do nothing */ + } + + /* +@@ -66,21 +67,20 @@ where + * Such code accesses all constant addresses through a global offset table (GOT). + * TODO: consider check PIE + */ +- let sym_info = symbol.get_st_info(); +- if debuginfo_e_type == ET_DYN +- && elf_st_bind(sym_info) == STB_GLOBAL +- && elf_st_type(sym_info) == STT_OBJECT +- && symbol.get_st_shndx() == SHN_LIVEPATCH ++ if debuginfo_e_type == elf::ET_DYN ++ && elf::elf_st_bind(sym_st_info) == elf::STB_GLOBAL ++ && elf::elf_st_type(sym_st_info) == elf::STT_OBJECT ++ && symbol.get_st_shndx() == elf::SHN_LIVEPATCH + { +- symbol.set_st_shndx(SHN_UNDEF); ++ symbol.set_st_shndx(elf::SHN_UNDEF); + } + } + Ok(()) + } + + fn __partial_resolve_patch( +- symbol: &mut write::SymbolHeader, +- debuginfo_syms: &mut read::SymbolHeaderTable, ++ symbol: &mut elf::write::SymbolHeader, ++ debuginfo_syms: &mut elf::read::SymbolHeaderTable, + ei_osabi: u8, + ) -> Result<()> { + debuginfo_syms.reset(0); +@@ -88,28 +88,29 @@ fn __partial_resolve_patch( + for debuginfo_sym in debuginfo_syms { + /* No need to handle section symbol */ + let sym_info = debuginfo_sym.get_st_info(); +- if elf_st_type(sym_info) == STT_SECTION { ++ if elf::elf_st_type(sym_info) == elf::STT_SECTION { + continue; + } + + let debuginfo_name = debuginfo_sym.get_st_name(); +- if elf_st_bind(sym_info).ne(&elf_st_bind(symbol.get_st_info())) ++ if elf::elf_st_bind(sym_info).ne(&elf::elf_st_bind(symbol.get_st_info())) + || debuginfo_name.ne(symbol.get_st_name()) + { + continue; + } + + /* leave it to be handled in running time */ +- if debuginfo_sym.get_st_shndx() == SHN_UNDEF { ++ if debuginfo_sym.get_st_shndx() == elf::SHN_UNDEF { + continue; + } + + // symbol type is STT_IFUNC, need search st_value in .plt table in upatch. +- let is_ifunc = (ei_osabi.eq(&ELFOSABI_GNU) || ei_osabi.eq(&ELFOSABI_FREEBSD)) +- && elf_st_type(sym_info).eq(&STT_IFUNC); +- symbol.set_st_shndx(match is_ifunc { +- true => SHN_UNDEF, +- false => SHN_LIVEPATCH, ++ let is_ifunc = (ei_osabi.eq(&elf::ELFOSABI_GNU) || ei_osabi.eq(&elf::ELFOSABI_FREEBSD)) ++ && elf::elf_st_type(sym_info).eq(&elf::STT_IFUNC); ++ symbol.set_st_shndx(if is_ifunc { ++ elf::SHN_UNDEF ++ } else { ++ elf::SHN_LIVEPATCH + }); + symbol.set_st_info(sym_info); + symbol.set_st_other(debuginfo_sym.get_st_other()); +@@ -131,17 +132,17 @@ fn __partial_resolve_patch( + * then we can't match these symbols, we change these symbols to GLOBAL here. + */ + pub fn resolve_dynamic>(debuginfo: P) -> Result<()> { +- let mut debuginfo_elf = write::Elf::parse(debuginfo)?; ++ let mut debuginfo_elf = elf::write::Elf::parse(debuginfo)?; + let debuginfo_header = debuginfo_elf.header()?; + +- if debuginfo_header.get_e_type().ne(&ET_DYN) { ++ if debuginfo_header.get_e_type().ne(&elf::ET_DYN) { + return Ok(()); + } + + let mut debuginfo_symbols = debuginfo_elf.symbols()?; + + for mut symbol in &mut debuginfo_symbols { +- if elf_st_type(symbol.get_st_info()).ne(&STT_FILE) { ++ if elf::elf_st_type(symbol.get_st_info()).ne(&elf::STT_FILE) { + continue; + } + +@@ -154,23 +155,23 @@ pub fn resolve_dynamic>(debuginfo: P) -> Result<()> { + Ok(()) + } + +-fn _resolve_dynamic(debuginfo_symbols: &mut write::SymbolHeaderTable) -> Result<()> { ++fn _resolve_dynamic(debuginfo_symbols: &mut elf::write::SymbolHeaderTable) -> Result<()> { + for mut symbol in debuginfo_symbols { +- if elf_st_type(symbol.get_st_info()).eq(&STT_FILE) { ++ if elf::elf_st_type(symbol.get_st_info()).eq(&elf::STT_FILE) { + break; + } + +- let info = symbol.get_st_info(); +- if elf_st_bind(info).ne(&STB_GLOBAL) { ++ let st_info = symbol.get_st_info(); ++ if elf::elf_st_bind(st_info).ne(&elf::STB_GLOBAL) { + let symbol_name = symbol.get_st_name(); + trace!( + "resolve_dynamic: set {} bind {} to 1", + symbol_name.to_string_lossy(), +- elf_st_bind(info) ++ elf::elf_st_bind(st_info) + ); + +- let info = elf_st_type(symbol.get_st_info()) | (STB_GLOBAL << 4); +- symbol.set_st_info(info); ++ let new_st_info = elf::elf_st_type(st_info) | (elf::STB_GLOBAL << 4); ++ symbol.set_st_info(new_st_info); + } + } + Ok(()) +diff --git a/upatch-build/src/rpc/remote.rs b/upatch-build/src/rpc/remote.rs +index 9927ece..52ea6a3 100644 +--- a/upatch-build/src/rpc/remote.rs ++++ b/upatch-build/src/rpc/remote.rs +@@ -54,27 +54,22 @@ impl RpcRemote { + impl RpcRemote { + fn parse_error(&self, error: Error) -> anyhow::Error { + match error { +- Error::Transport(e) => { ++ Error::Transport(err) => { + anyhow!( + "Cannot connect to upatch daemon at unix://{}, {}", + self.socket.display(), +- e.source() ++ err.source() + .map(|e| e.to_string()) + .unwrap_or_else(|| "Connection timeout".to_string()) + ) + } +- Error::Json(e) => { +- debug!("Json parse error: {:?}", e); ++ Error::Json(err) => { ++ debug!("Json parse error: {:?}", err); + anyhow!("Failed to parse response") + } +- Error::Rpc(ref e) => match e.message == "Method not found" { +- true => { +- anyhow!("Method is unimplemented") +- } +- false => { +- anyhow!("{}", e.message) +- } +- }, ++ Error::Rpc(err) => { ++ anyhow!("{}", err.message) ++ } + _ => { + debug!("{:?}", error); + anyhow!("Response is invalid") +diff --git a/upatchd/build.rs b/upatchd/build.rs +index 3809c54..6ddb941 100644 +--- a/upatchd/build.rs ++++ b/upatchd/build.rs +@@ -12,26 +12,25 @@ + * See the Mulan PSL v2 for more details. + */ + +-use std::{env, process::Command}; ++use std::{env, ffi::OsStr, os::unix::ffi::OsStrExt, process::Command}; + + fn rewrite_version() { +- const ENV_VERSION_NAME: &str = "BUILD_VERSION"; +- const PKG_VERSION_NAME: &str = "CARGO_PKG_VERSION"; ++ const PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); ++ const ENV_VERSION: Option<&str> = option_env!("BUILD_VERSION"); + +- let version = env::var(ENV_VERSION_NAME).unwrap_or_else(|_| { +- let pkg_version = env::var(PKG_VERSION_NAME).expect("Failed to fetch package version"); +- let git_output = Command::new("git") +- .args(["rev-parse", "--short", "HEAD"]) +- .output() +- .map(|output| String::from_utf8(output.stdout).expect("Failed to fetch git version")); +- +- match git_output { +- Ok(git_version) => format!("{}-g{}", pkg_version, git_version), +- Err(_) => pkg_version, +- } +- }); +- +- println!("cargo:rustc-env={}={}", PKG_VERSION_NAME, version); ++ println!( ++ "cargo:rustc-env=CARGO_PKG_VERSION={}", ++ ENV_VERSION.map(String::from).unwrap_or_else(|| { ++ Command::new("git") ++ .args(["rev-parse", "--short", "HEAD"]) ++ .output() ++ .map(|output| { ++ let git_version = OsStr::from_bytes(&output.stdout).to_string_lossy(); ++ format!("{}-g{}", PKG_VERSION, git_version) ++ }) ++ .unwrap_or_else(|_| PKG_VERSION.to_string()) ++ }) ++ ); + } + + fn main() { +diff --git a/upatchd/src/helper/elf_resolver.rs b/upatchd/src/helper/elf_resolver.rs +index 9b62b00..c6e5e9f 100644 +--- a/upatchd/src/helper/elf_resolver.rs ++++ b/upatchd/src/helper/elf_resolver.rs +@@ -44,8 +44,8 @@ impl ElfResolver<'_> { + let lines = output.stdout.lines(); + for line in lines { + let words = line.split_whitespace().collect::>(); +- if let Some(path) = words.get(2) { +- if let Ok(path) = fs::canonicalize(path) { ++ if let Some(lib_path) = words.get(2) { ++ if let Ok(path) = fs::canonicalize(lib_path) { + paths.push(path); + } + } +diff --git a/upatchd/src/helper/ioctl.rs b/upatchd/src/helper/ioctl.rs +index 0efbab4..4002c3a 100644 +--- a/upatchd/src/helper/ioctl.rs ++++ b/upatchd/src/helper/ioctl.rs +@@ -46,6 +46,7 @@ pub struct UpatchEnableRequest { + offset: u64, + } + ++#[repr(C)] + pub struct UpatchRegisterRequest { + exec_path: [u8; PATH_MAX as usize], + jump_path: [u8; PATH_MAX as usize], +diff --git a/upatchd/src/main.rs b/upatchd/src/main.rs +index 8141679..f73be0e 100644 +--- a/upatchd/src/main.rs ++++ b/upatchd/src/main.rs +@@ -117,9 +117,10 @@ impl Daemon { + + // Initialize logger + let max_level = args.log_level; +- let stdout_level = match args.daemon { +- true => LevelFilter::Off, +- false => max_level, ++ let stdout_level = if args.daemon { ++ LevelFilter::Off ++ } else { ++ max_level + }; + let log_spec = LogSpecification::builder().default(max_level).build(); + let file_spec = FileSpec::default() +@@ -199,9 +200,10 @@ impl Daemon { + + fs::set_permissions( + &socket_file, +- match socket_owner.as_raw() == socket_group.as_raw() { +- true => Permissions::from_mode(SOCKET_FILE_PERM_STRICT), +- false => Permissions::from_mode(SOCKET_FILE_PERM), ++ if socket_owner.as_raw() == socket_group.as_raw() { ++ Permissions::from_mode(SOCKET_FILE_PERM_STRICT) ++ } else { ++ Permissions::from_mode(SOCKET_FILE_PERM) + }, + )?; + +-- +2.34.1 + diff --git a/0038-syscare-abi-remove-display-limit-of-patch_info.patch b/0038-syscare-abi-remove-display-limit-of-patch_info.patch new file mode 100644 index 0000000..422a629 --- /dev/null +++ b/0038-syscare-abi-remove-display-limit-of-patch_info.patch @@ -0,0 +1,62 @@ +From 6c1d025b3328845377338d6a09b30a23611ba934 Mon Sep 17 00:00:00 2001 +From: Zhao Mengmeng +Date: Mon, 17 Jun 2024 16:18:20 +0800 +Subject: [PATCH] syscare-abi: remove display limit of patch_info + +When executing with `syscare info xxx`, show all the patches +it contains. + +Signed-off-by: Zhao Mengmeng +--- + syscare-abi/src/patch_info.rs | 21 +++------------------ + 1 file changed, 3 insertions(+), 18 deletions(-) + +diff --git a/syscare-abi/src/patch_info.rs b/syscare-abi/src/patch_info.rs +index 246f830..65b7650 100644 +--- a/syscare-abi/src/patch_info.rs ++++ b/syscare-abi/src/patch_info.rs +@@ -71,8 +71,6 @@ impl PatchInfo { + + impl std::fmt::Display for PatchInfo { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { +- const LIST_DISPLAY_LIMIT: usize = 9; +- + writeln!(f, "name: {}", self.name)?; + writeln!(f, "version: {}", self.version)?; + writeln!(f, "release: {}", self.release)?; +@@ -84,10 +82,6 @@ impl std::fmt::Display for PatchInfo { + if !self.entities.is_empty() { + writeln!(f, "entities:")?; + for (entity_idx, entity) in self.entities.iter().enumerate() { +- if entity_idx >= LIST_DISPLAY_LIMIT { +- writeln!(f, "* ......")?; +- break; +- } + writeln!(f, "* {}", entity.patch_name.to_string_lossy())?; + } + } +@@ -96,18 +90,9 @@ impl std::fmt::Display for PatchInfo { + writeln!(f, "patches:")?; + let last_idx = self.patches.len() - 1; + for (patch_idx, patch_file) in self.patches.iter().enumerate() { +- if patch_idx != last_idx { +- if patch_idx >= LIST_DISPLAY_LIMIT { +- writeln!(f, "* ......")?; +- break; +- } +- writeln!(f, "* {}", patch_file.name.to_string_lossy())? +- } else { +- if patch_idx >= LIST_DISPLAY_LIMIT { +- write!(f, "* ......")?; +- break; +- } +- write!(f, "* {}", patch_file.name.to_string_lossy())? ++ match patch_idx == last_idx { ++ false => writeln!(f, "* {}", patch_file.name.to_string_lossy())?, ++ true => write!(f, "* {}", patch_file.name.to_string_lossy())?, + } + } + } +-- +2.34.1 + diff --git a/0039-syscare-abi-fix-clippy-warnings.patch b/0039-syscare-abi-fix-clippy-warnings.patch new file mode 100644 index 0000000..b30b7eb --- /dev/null +++ b/0039-syscare-abi-fix-clippy-warnings.patch @@ -0,0 +1,49 @@ +From 345ea586c7fa196f0778eb28b78c9ceb51e5db75 Mon Sep 17 00:00:00 2001 +From: renoseven +Date: Sat, 29 Jun 2024 17:03:30 +0800 +Subject: [PATCH] syscare-abi: fix clippy warnings + +Signed-off-by: renoseven +--- + syscare-abi/src/patch_info.rs | 24 ++++++++++-------------- + 1 file changed, 10 insertions(+), 14 deletions(-) + +diff --git a/syscare-abi/src/patch_info.rs b/syscare-abi/src/patch_info.rs +index 65b7650..f23ce9b 100644 +--- a/syscare-abi/src/patch_info.rs ++++ b/syscare-abi/src/patch_info.rs +@@ -79,21 +79,17 @@ impl std::fmt::Display for PatchInfo { + writeln!(f, "target: {}", self.target.short_name())?; + writeln!(f, "license: {}", self.target.license)?; + writeln!(f, "description: {}", self.description)?; +- if !self.entities.is_empty() { +- writeln!(f, "entities:")?; +- for (entity_idx, entity) in self.entities.iter().enumerate() { +- writeln!(f, "* {}", entity.patch_name.to_string_lossy())?; +- } ++ writeln!(f, "entities:")?; ++ for entity in &self.entities { ++ writeln!(f, "* {}", entity.patch_name.to_string_lossy())?; + } +- +- if !self.patches.is_empty() { +- writeln!(f, "patches:")?; +- let last_idx = self.patches.len() - 1; +- for (patch_idx, patch_file) in self.patches.iter().enumerate() { +- match patch_idx == last_idx { +- false => writeln!(f, "* {}", patch_file.name.to_string_lossy())?, +- true => write!(f, "* {}", patch_file.name.to_string_lossy())?, +- } ++ writeln!(f, "patches:")?; ++ let last_idx = self.patches.len() - 1; ++ for (idx, patch) in self.patches.iter().enumerate() { ++ if idx == last_idx { ++ write!(f, "* {}", patch.name.to_string_lossy())? ++ } else { ++ writeln!(f, "* {}", patch.name.to_string_lossy())? + } + } + +-- +2.34.1 + diff --git a/0040-update-README.md.patch b/0040-update-README.md.patch new file mode 100644 index 0000000..977e1f8 --- /dev/null +++ b/0040-update-README.md.patch @@ -0,0 +1,30 @@ +From 8f1372be9df4a60c6b3b50bfbfa6327fc2281647 Mon Sep 17 00:00:00 2001 +From: lixiang_yewu +Date: Thu, 1 Aug 2024 02:34:16 +0000 +Subject: [PATCH] =?UTF-8?q?update=20README.md.=20=E6=8C=87=E4=BB=A4?= + =?UTF-8?q?=E5=86=99=E9=94=99=E4=BA=86?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: lixiang_yewu +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index 138c059..f12b03d 100644 +--- a/README.md ++++ b/README.md +@@ -113,7 +113,7 @@ $ sudo syscare active redis-6.2.5-1/HP001 + + 3. 补丁去激活 + ```bash +-$ sudo syscarae deactive redis-6.2.5-1/HP001 ++$ sudo syscare deactive redis-6.2.5-1/HP001 + ``` + + 4. 补丁卸载/移除 +-- +2.34.1 + diff --git a/0041-upatch-diff-fix-.rela.text-section-status-bug.patch b/0041-upatch-diff-fix-.rela.text-section-status-bug.patch new file mode 100644 index 0000000..ef3f216 --- /dev/null +++ b/0041-upatch-diff-fix-.rela.text-section-status-bug.patch @@ -0,0 +1,46 @@ +From f0c9f95fec6b8c3b6ee7f4852605b346d903c0e6 Mon Sep 17 00:00:00 2001 +From: ningyu <405888464@qq.com> +Date: Fri, 9 Aug 2024 12:17:18 +0800 +Subject: [PATCH] upatch-diff: fix .rela.text section status bug + +Signed-off-by: ningyu <405888464@qq.com> +--- + upatch-diff/create-diff-object.c | 2 +- + upatch-diff/elf-compare.c | 6 ++---- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/upatch-diff/create-diff-object.c b/upatch-diff/create-diff-object.c +index 8830956..0eea362 100644 +--- a/upatch-diff/create-diff-object.c ++++ b/upatch-diff/create-diff-object.c +@@ -868,7 +868,7 @@ static void verify_patchability(struct upatch_elf *uelf) + int errs = 0; + + list_for_each_entry(sec, &uelf->sections, list) { +- if (sec->status == CHANGED && !sec->include) { ++ if (sec->status == CHANGED && !sec->include && !is_rela_section(sec)) { + log_normal("Section '%s' is changed, but it is not selected for inclusion\n", sec->name); + errs++; + } +diff --git a/upatch-diff/elf-compare.c b/upatch-diff/elf-compare.c +index 851c25f..5d39825 100644 +--- a/upatch-diff/elf-compare.c ++++ b/upatch-diff/elf-compare.c +@@ -345,12 +345,10 @@ static inline void update_section_status(struct section *sec, enum status status + sec->twin->status = status; + } + if (is_rela_section(sec)) { +- if ((sec->base != NULL) && +- (sec->base->sym != NULL)) { ++ if ((sec->base != NULL) && (sec->base->sym != NULL) && status != SAME) { + sec->base->sym->status = status; + } +- } +- else { ++ } else { + if (sec->sym != NULL) { + sec->sym->status = status; + } +-- +2.34.1 + diff --git a/0042-upatch-manage-resolve-plt-firstly.patch b/0042-upatch-manage-resolve-plt-firstly.patch new file mode 100644 index 0000000..539d7bf --- /dev/null +++ b/0042-upatch-manage-resolve-plt-firstly.patch @@ -0,0 +1,34 @@ +From c5422f8da6735efb5746c167fef01d9c20bd69e5 Mon Sep 17 00:00:00 2001 +From: ningyu <405888464@qq.com> +Date: Fri, 9 Aug 2024 14:18:50 +0800 +Subject: [PATCH] upatch-manage: resolve plt firstly + +Signed-off-by: ningyu <405888464@qq.com> +--- + upatch-manage/upatch-resolve.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/upatch-manage/upatch-resolve.c b/upatch-manage/upatch-resolve.c +index 197ea2f..5f1c2de 100644 +--- a/upatch-manage/upatch-resolve.c ++++ b/upatch-manage/upatch-resolve.c +@@ -254,12 +254,12 @@ static unsigned long resolve_symbol(struct upatch_elf *uelf, + * Approach 3 is more general, but difficulty to implement. + */ + +- /* resolve from got */ +- elf_addr = resolve_rela_dyn(uelf, obj, name, &patch_sym); ++ /* resolve from plt */ ++ elf_addr = resolve_rela_plt(uelf, obj, name, &patch_sym); + +- /* resolve from plt */ ++ /* resolve from got */ + if (!elf_addr) { +- elf_addr = resolve_rela_plt(uelf, obj, name, &patch_sym); ++ elf_addr = resolve_rela_dyn(uelf, obj, name, &patch_sym); + } + + /* resolve from dynsym */ +-- +2.34.1 + diff --git a/0043-upatch-manage-fix-find-upatch-region-bug.patch b/0043-upatch-manage-fix-find-upatch-region-bug.patch new file mode 100644 index 0000000..9d412bb --- /dev/null +++ b/0043-upatch-manage-fix-find-upatch-region-bug.patch @@ -0,0 +1,261 @@ +From d0bd28247e41b9cec11d61f0d1b6a86f78a4dabd Mon Sep 17 00:00:00 2001 +From: ningyu <405888464@qq.com> +Date: Fri, 9 Aug 2024 14:33:01 +0800 +Subject: [PATCH] upatch-manage: fix find upatch region bug + +Signed-off-by: ningyu <405888464@qq.com> +--- + upatch-manage/arch/aarch64/process.h | 28 --------- + upatch-manage/arch/x86_64/process.h | 28 --------- + upatch-manage/upatch-patch.c | 2 +- + upatch-manage/upatch-process.c | 91 ++++++---------------------- + upatch-manage/upatch-process.h | 6 +- + 5 files changed, 23 insertions(+), 132 deletions(-) + delete mode 100644 upatch-manage/arch/aarch64/process.h + delete mode 100644 upatch-manage/arch/x86_64/process.h + +diff --git a/upatch-manage/arch/aarch64/process.h b/upatch-manage/arch/aarch64/process.h +deleted file mode 100644 +index 8acf04b..0000000 +--- a/upatch-manage/arch/aarch64/process.h ++++ /dev/null +@@ -1,28 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0 +-/* +- * upatch-manage +- * Copyright (C) 2024 Huawei Technologies Co., Ltd. +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with this program; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#ifndef __PROCESS__ +-#define __PROCESS__ +- +-#ifndef MAX_DISTANCE +-#define MAX_DISTANCE 0x8000000 +-#endif +- +-#endif +\ No newline at end of file +diff --git a/upatch-manage/arch/x86_64/process.h b/upatch-manage/arch/x86_64/process.h +deleted file mode 100644 +index 5de8fc3..0000000 +--- a/upatch-manage/arch/x86_64/process.h ++++ /dev/null +@@ -1,28 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0 +-/* +- * upatch-manage +- * Copyright (C) 2024 Huawei Technologies Co., Ltd. +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License along +- * with this program; if not, write to the Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +- */ +- +-#ifndef __PROCESS__ +-#define __PROCESS__ +- +-#ifndef MAX_DISTANCE +-#define MAX_DISTANCE 0x80000000 +-#endif +- +-#endif +\ No newline at end of file +diff --git a/upatch-manage/upatch-patch.c b/upatch-manage/upatch-patch.c +index 8a1ad41..c9fcbc9 100644 +--- a/upatch-manage/upatch-patch.c ++++ b/upatch-manage/upatch-patch.c +@@ -271,7 +271,7 @@ static void *upatch_alloc(struct object_file *obj, size_t sz) + unsigned long addr; + struct vm_hole *hole = NULL; + +- addr = object_find_patch_region_nolimit(obj, sz, &hole); ++ addr = object_find_patch_region(obj, sz, &hole); + if (!addr) + return NULL; + +diff --git a/upatch-manage/upatch-process.c b/upatch-manage/upatch-process.c +index 84ec030..f4033cb 100644 +--- a/upatch-manage/upatch-process.c ++++ b/upatch-manage/upatch-process.c +@@ -33,7 +33,6 @@ + + #include "list.h" + #include "log.h" +-#include "process.h" + #include "upatch-common.h" + #include "upatch-elf.h" + #include "upatch-process.h" +@@ -804,8 +803,9 @@ int vm_hole_split(struct vm_hole *hole, unsigned long alloc_start, + * and the next hole as a right candidate. Pace through them until there is + * enough space in the hole for the patch. + * +- * Since holes can be much larger than 2GiB take extra caution to allocate +- * patch region inside the (-2GiB, +2GiB) range from the original object. ++ * Due to relocation constraints, the hole position should be whin 4GB range ++ * from the obj. ++ * eg: R_AARCH64_ADR_GOT_PAGE + */ + unsigned long object_find_patch_region(struct object_file *obj, size_t memsize, + struct vm_hole **hole) +@@ -813,96 +813,41 @@ unsigned long object_find_patch_region(struct object_file *obj, size_t memsize, + struct list_head *head = &obj->proc->vmaholes; + struct vm_hole *left_hole = obj->previous_hole; + struct vm_hole *right_hole = next_hole(left_hole, head); +- unsigned long max_distance = MAX_DISTANCE; ++ unsigned long region_start = 0; + struct obj_vm_area *sovma; +- + unsigned long obj_start, obj_end; +- unsigned long region_start = 0, region_end = 0; +- +- log_debug("Looking for patch region for '%s'...\n", obj->name); + + sovma = list_first_entry(&obj->vma, struct obj_vm_area, list); + obj_start = sovma->inmem.start; + sovma = list_entry(obj->vma.prev, struct obj_vm_area, list); + obj_end = sovma->inmem.end; + +- max_distance -= memsize; +- +- /* TODO carefully check for the holes laying between obj_start and +- * obj_end, i.e. just after the executable segment of an executable +- */ +- while (left_hole != NULL && right_hole != NULL) { +- if (right_hole != NULL && +- right_hole->start - obj_start > max_distance) +- right_hole = NULL; +- else if (hole_size(right_hole) > memsize) { +- region_start = right_hole->start; +- region_end = (right_hole->end - obj_start) <= +- max_distance ? +- right_hole->end - memsize : +- obj_start + max_distance; +- *hole = right_hole; +- break; +- } else +- right_hole = next_hole(right_hole, head); +- +- if (left_hole != NULL && +- obj_end - left_hole->end > max_distance) +- left_hole = NULL; +- else if (hole_size(left_hole) > memsize) { +- region_start = (obj_end - left_hole->start) <= +- max_distance ? +- left_hole->start : +- obj_end > max_distance ? +- obj_end - max_distance : +- 0; +- region_end = left_hole->end - memsize; +- *hole = left_hole; +- break; +- } else +- left_hole = prev_hole(left_hole, head); +- } +- +- if (region_start == region_end) { +- log_error("Cannot find suitable region for patch '%s'\n", obj->name); +- return -1UL; +- } +- +- region_start = (region_start >> (unsigned long)PAGE_SHIFT) << (unsigned long)PAGE_SHIFT; +- log_debug("Found patch region for '%s' at 0x%lx\n", obj->name, +- region_start); +- +- return region_start; +-} +-unsigned long object_find_patch_region_nolimit(struct object_file *obj, size_t memsize, +- struct vm_hole **hole) +-{ +- struct list_head *head = &obj->proc->vmaholes; +- struct vm_hole *left_hole = obj->previous_hole; +- struct vm_hole *right_hole = next_hole(left_hole, head); +- unsigned long region_start = 0; +- + log_debug("Looking for patch region for '%s'...\n", obj->name); + +- while (right_hole != NULL) { ++ while (right_hole != NULL || left_hole != NULL) { + if (hole_size(right_hole) > memsize) { + *hole = right_hole; ++ region_start = right_hole->start; ++ if (region_start + memsize - obj_start > MAX_DISTANCE) { ++ continue; ++ } + goto found; +- } else +- right_hole = next_hole(right_hole, head); +- +- while (left_hole != NULL) ++ } + if (hole_size(left_hole) > memsize) { + *hole = left_hole; ++ region_start = left_hole->end - memsize; ++ if (obj_end - region_start > MAX_DISTANCE) { ++ continue; ++ } + goto found; +- } else +- left_hole = prev_hole(left_hole, head); ++ } ++ right_hole = next_hole(right_hole, head); ++ left_hole = prev_hole(left_hole, head); + } +- + log_error("Cannot find suitable region for patch '%s'\n", obj->name); + return -1UL; + found: +- region_start = ((*hole)->start >> PAGE_SHIFT) << PAGE_SHIFT; ++ region_start = (region_start >> PAGE_SHIFT) << PAGE_SHIFT; + log_debug("Found patch region for '%s' 0xat %lx\n", obj->name, + region_start); + +diff --git a/upatch-manage/upatch-process.h b/upatch-manage/upatch-process.h +index be44cb5..fdbd752 100644 +--- a/upatch-manage/upatch-process.h ++++ b/upatch-manage/upatch-process.h +@@ -33,6 +33,10 @@ + #define ELFMAG "\177ELF" + #define SELFMAG 4 + ++#ifndef MAX_DISTANCE ++#define MAX_DISTANCE (1UL << 32) ++#endif ++ + enum { + MEM_READ, + MEM_WRITE, +@@ -143,7 +147,5 @@ int vm_hole_split(struct vm_hole *, unsigned long, unsigned long); + + unsigned long object_find_patch_region(struct object_file *, size_t, + struct vm_hole **); +-unsigned long object_find_patch_region_nolimit(struct object_file *, size_t, +- struct vm_hole **); + + #endif +-- +2.34.1 + diff --git a/0044-update-README.md.patch b/0044-update-README.md.patch new file mode 100644 index 0000000..a009859 --- /dev/null +++ b/0044-update-README.md.patch @@ -0,0 +1,26 @@ +From 7de47352a1201c4836ee71d119e07a5e544a16b4 Mon Sep 17 00:00:00 2001 +From: Caohongtao +Date: Wed, 14 Aug 2024 06:39:31 +0000 +Subject: [PATCH] update README.md. + +Signed-off-by: Caohongtao +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index f12b03d..15d4d48 100644 +--- a/README.md ++++ b/README.md +@@ -9,7 +9,7 @@ + + ## 软件架构 + +-​ 可以利用系统组件源代码与相应的patch问题，制作出相应组件补丁的RPM（包含补丁文件、依赖信息与配置信息等）. 制作的补丁RPM，可以上传到相应的补丁仓库中，集群的系统demon定时去查询补丁仓库, 对系统中运行的CVE与软件错误进行热修复，保证系统安全、稳定、高效运行。 ++​ 可以利用系统组件源代码与相应的patch问题，制作出相应组件补丁的RPM（包含补丁文件、依赖信息与配置信息等）. 制作的补丁RPM，可以上传到相应的补丁仓库中，集群的系统daemon定时去查询补丁仓库, 对系统中运行的CVE与软件错误进行热修复，保证系统安全、稳定、高效运行。 + + + +-- +2.34.1 + diff --git a/0045-common-fix-normalize-empty-path-return-current-path-.patch b/0045-common-fix-normalize-empty-path-return-current-path-.patch new file mode 100644 index 0000000..42f5368 --- /dev/null +++ b/0045-common-fix-normalize-empty-path-return-current-path-.patch @@ -0,0 +1,28 @@ +From e07e30d88d38227f9899b1a7a2e6de85e2f36c4e Mon Sep 17 00:00:00 2001 +From: renoseven +Date: Tue, 13 Aug 2024 17:31:50 +0800 +Subject: [PATCH] common: fix 'normalize empty path return current path' issue + +Signed-off-by: renoseven +--- + syscare-common/src/fs/fs_impl.rs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/syscare-common/src/fs/fs_impl.rs b/syscare-common/src/fs/fs_impl.rs +index e794c98..29c5d6e 100644 +--- a/syscare-common/src/fs/fs_impl.rs ++++ b/syscare-common/src/fs/fs_impl.rs +@@ -290,6 +290,10 @@ pub fn normalize>(path: P) -> io::Result { + let mut new_path = PathBuf::new(); + + let orig_path = path.as_ref(); ++ if orig_path.as_os_str().is_empty() { ++ return Ok(new_path); ++ } ++ + if orig_path.is_relative() { + new_path.push(env::current_dir()?); + } +-- +2.34.1 + diff --git a/0046-syscared-Add-PACTCH_CHECK-action-when-status-change-.patch b/0046-syscared-Add-PACTCH_CHECK-action-when-status-change-.patch new file mode 100644 index 0000000..cc23971 --- /dev/null +++ b/0046-syscared-Add-PACTCH_CHECK-action-when-status-change-.patch @@ -0,0 +1,30 @@ +From 1c70edca6667730867cdd1e5691885ebae9c04bd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=AE=81=E5=AE=87?= <405888464@qq.com> +Date: Thu, 15 Aug 2024 07:33:24 +0000 +Subject: [PATCH] syscared: Add PACTCH_CHECK action when status change from + Deactived to Actived +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: 宁宇 <405888464@qq.com> +--- + syscared/src/patch/manager.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/syscared/src/patch/manager.rs b/syscared/src/patch/manager.rs +index d156e4a..3a724db 100644 +--- a/syscared/src/patch/manager.rs ++++ b/syscared/src/patch/manager.rs +@@ -54,7 +54,7 @@ lazy_static! { + (PatchStatus::NotApplied, PatchStatus::Actived) => vec![PATCH_CHECK, PATCH_APPLY, PATCH_ACTIVE], + (PatchStatus::NotApplied, PatchStatus::Accepted) => vec![PATCH_CHECK, PATCH_APPLY, PATCH_ACTIVE, PATCH_ACCEPT], + (PatchStatus::Deactived, PatchStatus::NotApplied) => vec![PATCH_REMOVE], +- (PatchStatus::Deactived, PatchStatus::Actived) => vec![PATCH_ACTIVE], ++ (PatchStatus::Deactived, PatchStatus::Actived) => vec![PATCH_CHECK, PATCH_ACTIVE], + (PatchStatus::Deactived, PatchStatus::Accepted) => vec![PATCH_ACTIVE, PATCH_ACCEPT], + (PatchStatus::Actived, PatchStatus::NotApplied) => vec![PATCH_DEACTIVE, PATCH_REMOVE], + (PatchStatus::Actived, PatchStatus::Deactived) => vec![PATCH_DEACTIVE], +-- +2.34.1 + diff --git a/0047-all-fix-compile-failure-of-rustc-1.80.patch b/0047-all-fix-compile-failure-of-rustc-1.80.patch new file mode 100644 index 0000000..86308ed --- /dev/null +++ b/0047-all-fix-compile-failure-of-rustc-1.80.patch @@ -0,0 +1,207 @@ +From 058670c8782b8b840fb99ddc174e00feb3b9ff89 Mon Sep 17 00:00:00 2001 +From: renoseven +Date: Fri, 16 Aug 2024 14:21:00 +0800 +Subject: [PATCH] all: fix compile failure of rustc 1.80 + +Signed-off-by: renoseven +--- + syscare-build/src/build_root/package_root.rs | 6 ++---- + syscare-build/src/build_root/patch_root.rs | 11 +++-------- + syscared/src/patch/entity/kpatch.rs | 3 +-- + syscared/src/patch/entity/upatch.rs | 3 +-- + syscared/src/patch/resolver/kpatch.rs | 11 +++++++---- + syscared/src/patch/resolver/upatch.rs | 7 +++---- + 6 files changed, 17 insertions(+), 24 deletions(-) + +diff --git a/syscare-build/src/build_root/package_root.rs b/syscare-build/src/build_root/package_root.rs +index 75ff65d..eaac349 100644 +--- a/syscare-build/src/build_root/package_root.rs ++++ b/syscare-build/src/build_root/package_root.rs +@@ -25,7 +25,6 @@ const BUILD_ROOT_DIR_NAME: &str = "patch"; + + #[derive(Debug, Clone)] + pub struct PackageRoot { +- pub path: PathBuf, + pub source: PathBuf, + pub debuginfo: PathBuf, + pub build_root: PackageBuildRoot, +@@ -33,17 +32,16 @@ pub struct PackageRoot { + + impl PackageRoot { + pub fn new>(directory: P) -> Result { +- let path = directory.as_ref().to_path_buf(); ++ let path = directory.as_ref(); + let source = path.join(SOURCE_DIR_NAME); + let debuginfo = path.join(DEBUGINFO_DIR_NAME); + let build_root = PackageBuildRoot::new(path.join(BUILD_ROOT_DIR_NAME))?; + +- fs::create_dir_all(&path)?; ++ fs::create_dir_all(path)?; + fs::create_dir_all(&source)?; + fs::create_dir_all(&debuginfo)?; + + Ok(Self { +- path, + source, + debuginfo, + build_root, +diff --git a/syscare-build/src/build_root/patch_root.rs b/syscare-build/src/build_root/patch_root.rs +index d493233..0aa0a1c 100644 +--- a/syscare-build/src/build_root/patch_root.rs ++++ b/syscare-build/src/build_root/patch_root.rs +@@ -22,25 +22,20 @@ const OUTPUT_DIR_NAME: &str = "output"; + + #[derive(Debug, Clone)] + pub struct PatchRoot { +- pub path: PathBuf, + pub build: PathBuf, + pub output: PathBuf, + } + + impl PatchRoot { + pub fn new>(directory: P) -> Result { +- let path = directory.as_ref().to_path_buf(); ++ let path = directory.as_ref(); + let build = path.join(BUILD_DIR_NAME); + let output = path.join(OUTPUT_DIR_NAME); + +- fs::create_dir_all(&path)?; ++ fs::create_dir_all(path)?; + fs::create_dir_all(&build)?; + fs::create_dir_all(&output)?; + +- Ok(Self { +- path, +- build, +- output, +- }) ++ Ok(Self { build, output }) + } + } +diff --git a/syscared/src/patch/entity/kpatch.rs b/syscared/src/patch/entity/kpatch.rs +index ab2c8b2..a6b48c5 100644 +--- a/syscared/src/patch/entity/kpatch.rs ++++ b/syscared/src/patch/entity/kpatch.rs +@@ -14,7 +14,7 @@ + + use std::{ffi::OsString, path::PathBuf, sync::Arc}; + +-use syscare_abi::{PatchInfo, PatchType}; ++use syscare_abi::PatchInfo; + use uuid::Uuid; + + /// Kernel patch function definition +@@ -61,7 +61,6 @@ impl std::fmt::Display for KernelPatchFunction { + pub struct KernelPatch { + pub uuid: Uuid, + pub name: OsString, +- pub kind: PatchType, + pub info: Arc, + pub pkg_name: String, + pub module_name: OsString, +diff --git a/syscared/src/patch/entity/upatch.rs b/syscared/src/patch/entity/upatch.rs +index ef24866..0fbacb4 100644 +--- a/syscared/src/patch/entity/upatch.rs ++++ b/syscared/src/patch/entity/upatch.rs +@@ -14,7 +14,7 @@ + + use std::{ffi::OsString, path::PathBuf, sync::Arc}; + +-use syscare_abi::{PatchInfo, PatchType}; ++use syscare_abi::PatchInfo; + use uuid::Uuid; + + /// User patch function definition +@@ -58,7 +58,6 @@ impl std::fmt::Display for UserPatchFunction { + pub struct UserPatch { + pub uuid: Uuid, + pub name: OsString, +- pub kind: PatchType, + pub info: Arc, + pub pkg_name: String, + pub functions: Vec, +diff --git a/syscared/src/patch/resolver/kpatch.rs b/syscared/src/patch/resolver/kpatch.rs +index 7946c42..85ec18e 100644 +--- a/syscared/src/patch/resolver/kpatch.rs ++++ b/syscared/src/patch/resolver/kpatch.rs +@@ -21,7 +21,7 @@ use std::{ + use anyhow::{anyhow, Context, Result}; + use object::{NativeFile, Object, ObjectSection}; + +-use syscare_abi::{PatchEntity, PatchInfo, PatchType}; ++use syscare_abi::{PatchEntity, PatchInfo}; + use syscare_common::{ + concat_os, + ffi::{CStrExt, OsStrExt}, +@@ -71,7 +71,7 @@ mod ffi { + unsafe impl Pod for KpatchFunction {} + + pub struct KpatchRelocation { +- pub addr: (u64, Relocation), ++ pub _addr: (u64, Relocation), + pub name: (u64, Relocation), + pub object: (u64, Relocation), + } +@@ -93,7 +93,11 @@ mod ffi { + if let (Some(addr), Some(name), Some(object)) = + (self.0.next(), self.0.next(), self.0.next()) + { +- return Some(KpatchRelocation { addr, name, object }); ++ return Some(KpatchRelocation { ++ _addr: addr, ++ name, ++ object, ++ }); + } + None + } +@@ -205,7 +209,6 @@ impl PatchResolverImpl for KpatchResolverImpl { + "/", + &patch_entity.patch_target + ), +- kind: PatchType::KernelPatch, + info: patch_info.clone(), + pkg_name: patch_info.target.full_name(), + module_name, +diff --git a/syscared/src/patch/resolver/upatch.rs b/syscared/src/patch/resolver/upatch.rs +index cb06c24..e8c2f2c 100644 +--- a/syscared/src/patch/resolver/upatch.rs ++++ b/syscared/src/patch/resolver/upatch.rs +@@ -21,7 +21,7 @@ use std::{ + use anyhow::{anyhow, Context, Result}; + use object::{NativeFile, Object, ObjectSection}; + +-use syscare_abi::{PatchEntity, PatchInfo, PatchType}; ++use syscare_abi::{PatchEntity, PatchInfo}; + use syscare_common::{concat_os, ffi::CStrExt, fs}; + + use super::PatchResolverImpl; +@@ -59,7 +59,7 @@ mod ffi { + pub const UPATCH_FUNCTION_OFFSET: usize = 40; + + pub struct UpatchRelocation { +- pub addr: (u64, Relocation), ++ pub _addr: (u64, Relocation), + pub name: (u64, Relocation), + } + +@@ -78,7 +78,7 @@ mod ffi { + + fn next(&mut self) -> Option { + if let (Some(addr), Some(name)) = (self.0.next(), self.0.next()) { +- return Some(UpatchRelocation { addr, name }); ++ return Some(UpatchRelocation { _addr: addr, name }); + } + None + } +@@ -168,7 +168,6 @@ impl PatchResolverImpl for UpatchResolverImpl { + "/", + fs::file_name(&patch_entity.patch_target) + ), +- kind: PatchType::UserPatch, + info: patch_info.clone(), + pkg_name: patch_info.target.full_name(), + patch_file: patch_root.join(&patch_entity.patch_name), +-- +2.34.1 + diff --git a/syscare.spec b/syscare.spec index 85198a8..adbf2a9 100644 --- a/syscare.spec +++ b/syscare.spec @@ -1,46 +1,65 @@ %define build_version %{version}-%{release} %define kernel_devel_rpm %(echo $(rpm -q kernel-devel | head -n 1)) -%define kernel_version %(echo $(rpm -q --qf "\%%{VERSION}" %{kernel_devel_rpm})) %define kernel_name %(echo $(rpm -q --qf "\%%{VERSION}-\%%{RELEASE}.\%%{ARCH}" %{kernel_devel_rpm})) -%define pkg_kmod %{name}-kmod -%define pkg_build %{name}-build - ############################################ ############ Package syscare ############### ############################################ Name: syscare Version: 1.2.1 -Release: 9 +Release: 10 Summary: System hot-fix service License: MulanPSL-2.0 and GPL-2.0-only URL: https://gitee.com/openeuler/syscare Source0: %{name}-%{version}.tar.gz -Patch0001: 0001-upatch-hijacker-fix-compile-bug.patch -Patch0002: 0002-daemon-fix-cannot-get-file-selinux-xattr-when-selinu.patch -Patch0003: 0003-syscared-fix-syscare-check-command-does-not-check-sy.patch -Patch0004: 0004-syscared-fix-cannot-find-process-of-dynlib-patch-iss.patch -Patch0005: 0005-syscared-optimize-patch-error-logic.patch -Patch0006: 0006-syscared-optimize-transaction-creation-logic.patch -Patch0007: 0007-upatch-manage-optimize-output.patch -Patch0008: 0008-common-impl-CStr-from_bytes_with_next_nul.patch -Patch0009: 0009-syscared-improve-patch-management.patch -Patch0010: 0010-syscared-stop-activating-ignored-process-on-new-proc.patch -Patch0011: 0011-syscared-adapt-upatch-manage-exit-code-change.patch -Patch0012: 0012-upatch-manage-change-exit-code.patch -Patch0013: 0013-upatch-manage-change-the-way-to-calculate-frozen-tim.patch -Patch0014: 0014-abi-change-uuid-string-to-uuid-bytes.patch -Patch0015: 0015-upatch-build-fix-file-detection-cause-build-failure-.patch -Patch0016: 0016-upatch-diff-optimize-log-output.patch -Patch0017: 0017-security-change-directory-permission.patch -Patch0018: 0018-security-change-daemon-socket-permission.patch -Patch0019: 0019-upatch-manage-Fixed-the-core-dump-issue-after-applyi.patch -Patch0020: 0020-upatch-diff-fix-lookup_relf-failed-issue.patch -Patch0021: 0021-upatch-diff-only-check-changed-file-symbols.patch -Patch0022: 0022-upatch-diff-remove-rela-check-while-build-rebuilding.patch -Patch0023: 0023-syscared-fix-apply-kernel-module-patch-failure-issue.patch -Patch0024: 0024-syscare-build-fix-build-oot-module-failure-issue.patch +Patch0001: 0001-upatch-hijacker-fix-compile-bug.patch +Patch0002: 0002-daemon-fix-cannot-get-file-selinux-xattr-when-selinu.patch +Patch0003: 0003-syscared-fix-syscare-check-command-does-not-check-sy.patch +Patch0004: 0004-syscared-fix-cannot-find-process-of-dynlib-patch-iss.patch +Patch0005: 0005-syscared-optimize-patch-error-logic.patch +Patch0006: 0006-syscared-optimize-transaction-creation-logic.patch +Patch0007: 0007-upatch-manage-optimize-output.patch +Patch0008: 0008-common-impl-CStr-from_bytes_with_next_nul.patch +Patch0009: 0009-syscared-improve-patch-management.patch +Patch0010: 0010-syscared-stop-activating-ignored-process-on-new-proc.patch +Patch0011: 0011-syscared-adapt-upatch-manage-exit-code-change.patch +Patch0012: 0012-upatch-manage-change-exit-code.patch +Patch0013: 0013-upatch-manage-change-the-way-to-calculate-frozen-tim.patch +Patch0014: 0014-abi-change-uuid-string-to-uuid-bytes.patch +Patch0015: 0015-upatch-build-fix-file-detection-cause-build-failure-.patch +Patch0016: 0016-upatch-diff-optimize-log-output.patch +Patch0017: 0017-security-change-directory-permission.patch +Patch0018: 0018-security-change-daemon-socket-permission.patch +Patch0019: 0019-upatch-manage-Fixed-the-core-dump-issue-after-applyi.patch +Patch0020: 0020-upatch-diff-fix-lookup_relf-failed-issue.patch +Patch0021: 0021-upatch-diff-only-check-changed-file-symbols.patch +Patch0022: 0022-upatch-diff-remove-rela-check-while-build-rebuilding.patch +Patch0023: 0023-syscared-fix-apply-kernel-module-patch-failure-issue.patch +Patch0024: 0024-syscare-build-fix-build-oot-module-failure-issue.patch +Patch0025: 0025-all-finding-executable-from-environment-variables.patch +Patch0026: 0026-all-remove-redundant-code.patch +Patch0027: 0027-abi-reexport-uuid.patch +Patch0028: 0028-all-add-c-rust-compilation-options.patch +Patch0029: 0029-common-fix-failed-to-set-selinux-status-issue.patch +Patch0030: 0030-upatch-diff-exit-with-error-when-any-tls-var-include.patch +Patch0031: 0031-upatch-diff-fix-lookup_relf-duplicate-failure.patch +Patch0032: 0032-upatch-diff-fix-memory-leak.patch +Patch0033: 0033-upatch-hijacker-fix-memory-leak.patch +Patch0034: 0034-upatch-manage-fix-memory-leak.patch +Patch0035: 0035-security-sanitize-sensitive-code.patch +Patch0036: 0036-all-implement-asan-gcov-build-type.patch +Patch0037: 0037-all-clean-code.patch +Patch0038: 0038-syscare-abi-remove-display-limit-of-patch_info.patch +Patch0039: 0039-syscare-abi-fix-clippy-warnings.patch +Patch0040: 0040-update-README.md.patch +Patch0041: 0041-upatch-diff-fix-.rela.text-section-status-bug.patch +Patch0042: 0042-upatch-manage-resolve-plt-firstly.patch +Patch0043: 0043-upatch-manage-fix-find-upatch-region-bug.patch +Patch0044: 0044-update-README.md.patch +Patch0045: 0045-common-fix-normalize-empty-path-return-current-path-.patch +Patch0046: 0046-syscared-Add-PACTCH_CHECK-action-when-status-change-.patch +Patch0047: 0047-all-fix-compile-failure-of-rustc-1.80.patch BuildRequires: cmake >= 3.14 make BuildRequires: rust >= 1.51 cargo >= 1.51 @@ -49,7 +68,7 @@ BuildRequires: kernel-devel Requires: coreutils systemd Requires: kpatch-runtime -Excludearch: loongarch64 +Excludearch: loongarch64 ############### Description ################ %description @@ -117,12 +136,12 @@ fi ################## Files ################### %files -%defattr(-,root,root,-) +%defattr(-,root,root,0555) %dir /usr/libexec/syscare -%attr(550,root,root) /usr/lib/systemd/system/syscare.service -%attr(550,root,root) /usr/libexec/syscare/upatch-manage -%attr(550,root,root) /usr/bin/syscared -%attr(555,root,root) /usr/bin/syscare +%attr(0555,root,root) /usr/bin/syscare +%attr(0550,root,root) /usr/bin/syscared +%attr(0550,root,root) /usr/lib/systemd/system/syscare.service +%attr(0550,root,root) /usr/libexec/syscare/upatch-manage ############################################ ########## Package syscare-build ########### @@ -174,26 +193,45 @@ fi ################## Files ################### %files build -%defattr(-,root,root,-) +%defattr(-,root,root,0555) %dir /usr/libexec/syscare -%attr(550,root,root) /usr/lib/systemd/system/upatch.service %attr(550,root,root) /usr/bin/upatchd -%attr(440,root,root) /usr/libexec/syscare/upatch_hijacker.ko %attr(555,root,root) /usr/libexec/syscare/syscare-build %attr(555,root,root) /usr/libexec/syscare/upatch-build %attr(555,root,root) /usr/libexec/syscare/upatch-diff -%attr(555,root,root) /usr/libexec/syscare/as-hijacker -%attr(555,root,root) /usr/libexec/syscare/cc-hijacker -%attr(555,root,root) /usr/libexec/syscare/c++-hijacker -%attr(555,root,root) /usr/libexec/syscare/gcc-hijacker -%attr(555,root,root) /usr/libexec/syscare/g++-hijacker -%attr(555,root,root) /usr/libexec/syscare/gnu-as-hijacker -%attr(555,root,root) /usr/libexec/syscare/gnu-compiler-hijacker +%attr(555,root,root) /usr/libexec/syscare/as-helper +%attr(555,root,root) /usr/libexec/syscare/cc-helper +%attr(555,root,root) /usr/libexec/syscare/c++-helper +%attr(555,root,root) /usr/libexec/syscare/gcc-helper +%attr(555,root,root) /usr/libexec/syscare/g++-helper +%attr(555,root,root) /usr/libexec/syscare/gnu-as-helper +%attr(555,root,root) /usr/libexec/syscare/gnu-compiler-helper +%attr(440,root,root) /usr/libexec/syscare/upatch_helper.ko +%attr(550,root,root) /usr/lib/systemd/system/upatch.service ############################################ ################ Change log ################ ############################################ %changelog +* Fri Aug 16 2024 renoseven - 1.2.1-10 +- upatch-diff: fix '.rela' '.rela.text' resolving issue +- upatch-manage: fix plt resolving issue +- upatch-manage: fix patch region finding issue +- common: fix normalizing empty path return non-empty issue +- syscared: add check action for [DEACTIVED -> ACTIVED] transition +- abi: remove display limit of patch info +- all: clean code +- all: implement asan gcov build type +- security: sanitize sensitive code +- upatch-manage: fix memory leak +- upatch-helper: fix memory leak +- upatch-diff: fix memory leak +- upatch-diff: fix find duplicate symbol issue +- upatch-diff: prevent tls variable modification +- common: fix failed to set selinux status issue +- all: add compile options +- all: remove redundant code +- all: finding executable from environment variables * Wed Jul 03 2024 yueyuankun - 1.2.1-9 - add excludearch loongarch64 * Mon May 20 2024 ningyu - 1.2.1-8 -- Gitee