From db9c6e989b7c1a5005633291f7bb2eebd9491dc9 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Tue, 4 Mar 2014 21:28:15 +0400 Subject: [PATCH 1/2] =?UTF-8?q?AntiFedorizm=5F=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kmod/core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmod/core/Makefile b/kmod/core/Makefile index 25109018b..73f5a5017 100644 --- a/kmod/core/Makefile +++ b/kmod/core/Makefile @@ -1,5 +1,5 @@ # make rules -KPATCH_BUILD ?= /usr/src/kernels/$(shell uname -r) +KPATCH_BUILD ?= /lib/modules/$(shell uname -r)/source THISDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) ifeq ($(wildcard $(KPATCH_BUILD)),) From 041c7ccae68e36b771156896776ccbb3b862c9cd Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Tue, 4 Mar 2014 21:28:34 +0400 Subject: [PATCH 2/2] Type coeection --- kpatch-build/add-patches-section.c | 2 +- kpatch-build/create-diff-object.c | 4 ++-- kpatch-build/link-vmlinux-syms.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kpatch-build/add-patches-section.c b/kpatch-build/add-patches-section.c index 6e6c53a10..36fc59202 100644 --- a/kpatch-build/add-patches-section.c +++ b/kpatch-build/add-patches-section.c @@ -235,7 +235,7 @@ int main(int argc, char **argv) cur->vm_addr = vsym->sym.st_value; cur->vm_len = vsym->sym.st_size; cur->action = PATCH; - printf("original function at address %016lx (length %d)\n", + printf("original function at address %016lx (length %zu)\n", cur->vm_addr, cur->vm_len); patches_nr++; } diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c index 2dc883dc6..49befa751 100644 --- a/kpatch-build/create-diff-object.c +++ b/kpatch-build/create-diff-object.c @@ -368,7 +368,7 @@ void kpatch_create_symbol_table(struct kpatch_elf *kelf) /* create reverse link from local sec to local sym */ if (GELF_ST_TYPE(sym->sym.st_info) != STT_NOTYPE) { if (sym->sym.st_value) - ERROR("local symbol starts at section offset %d, expected 0", + ERROR("local symbol starts at section offset %zu, expected 0", sym->sym.st_value); sym->sec->sym = sym; } @@ -745,7 +745,7 @@ void kpatch_dump_kelf(struct kpatch_elf *kelf) printf(", base-> %s\n", sec->base->name); printf("rela section expansion\n"); for_each_rela(j, rela, &sec->relas) { - printf("sym %d, offset %d, type %d, %s %s %d %s\n", + printf("sym %zd, offset %d, type %d, %s %s %d %s\n", GELF_R_SYM(rela->rela.r_info), rela->offset, rela->type, rela->sym->name, diff --git a/kpatch-build/link-vmlinux-syms.c b/kpatch-build/link-vmlinux-syms.c index 8e8f2a944..87b11605c 100644 --- a/kpatch-build/link-vmlinux-syms.c +++ b/kpatch-build/link-vmlinux-syms.c @@ -263,7 +263,7 @@ int main(int argc, char **argv) cur->vm_addr = vsym->sym.st_value; cur->vm_len = vsym->sym.st_size; cur->action = LINK; - printf("original symbol at address %016lx (length %d)\n", + printf("original symbol at address %016lx (length %zu)\n", cur->vm_addr, cur->vm_len); }