[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 5 Sep 2018 02:51:48 +0200
From: Adam Zabrocki <pi3@....com.pl>
To: lkrg-users@...ts.openwall.com
Subject: Re: Small fixes = { .gitignore, Makefile, ... }
Hi,
I've merged Mikhail's patches to the official LKRG bitbucket repo. But
before I've done it, first I've pushed very big and heavy feature -
*_JUMP_LABEL support for kernel modules. All changes you can see here:
https://bitbucket.org/Adam_pi3/lkrg-main/commits/all
Thanks again Mikhail for your patches!
Adam
On Sun, Sep 02, 2018 at 06:33:06AM +0200, Adam Zabrocki wrote:
> Thanks Mikhail for taking a look at the project and provide patches - I will
> try to address / merge them :)
>
> Thanks,
> Adam
>
> On Sat, Sep 01, 2018 at 01:36:37PM +0000, Mikhail Klementev wrote:
> > Hello,
> >
> > I start to work with that project. Here is small fixes attached for
> > help to work with it.
> >
> > Makefile fix required for easy compile for different kernels, like that:
> >
> > make P_KERNEL=~/src/git.kernel.org/upstream/4.18.5
> >
> > All other commits is obvious.
> >
> > --
> > With eval and apply,
> > Mikhail Klementev.
>
> > From a7cc0e0e31cfc89bc069d6f2a61844c6fb6070ce Mon Sep 17 00:00:00 2001
> > From: Mikhail Klementev <jollheef@...eup.net>
> > Date: Sat, 1 Sep 2018 12:33:33 +0000
> > Subject: [PATCH 1/3] Ignore temporary files
> >
> > ---
> > .gitignore | 19 +++++++++++++++++++
> > 1 file changed, 19 insertions(+)
> > create mode 100644 .gitignore
> >
> > diff --git a/.gitignore b/.gitignore
> > new file mode 100644
> > index 0000000..a28a2ed
> > --- /dev/null
> > +++ b/.gitignore
> > @@ -0,0 +1,19 @@
> > +# build files
> > +.tmp_versions
> > +Module.symvers
> > +modules.order
> > +*.cmd
> > +*.ko
> > +*.mod.c
> > +*.o.d
> > +*.o
> > +.cache.mk
> > +
> > +# kcov
> > +*.gcno
> > +*.gcda
> > +
> > +# GNU Global
> > +GPATH
> > +GRTAGS
> > +GTAGS
> > --
> > 2.16.4
> >
>
> > From 14e8a54cf3d4407c547a1b64ccdd05cf7156be2e Mon Sep 17 00:00:00 2001
> > From: Mikhail Klementev <jollheef@...eup.net>
> > Date: Sat, 1 Sep 2018 12:35:57 +0000
> > Subject: [PATCH 2/3] Support setting kernel path through make explicitly
> >
> > ---
> > Makefile | 9 +++++----
> > 1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index c43c83e..bf0078b 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -10,6 +10,7 @@ export CFLAGS="$CFLAGS"
> > P_OUTPUT = output
> > P_PWD = $(shell pwd)
> > P_KVER = $(shell uname -r)
> > +P_KERNEL := /lib/modules/$(P_KVER)/build
> >
> > obj-m += p_lkrg.o
> > p_lkrg-objs += src/modules/ksyms/p_resolve_ksym.o \
> > @@ -70,16 +71,16 @@ p_lkrg-objs += src/modules/ksyms/p_resolve_ksym.o \
> >
> >
> > all:
> > -# $(MAKE) -C /lib/modules/$(P_KVER)/build M=$(P_PWD) modules CONFIG_DEBUG_SECTION_MISMATCH=y
> > - $(MAKE) -C /lib/modules/$(P_KVER)/build M=$(P_PWD) modules
> > +# $(MAKE) -C $(P_KERNEL) M=$(P_PWD) modules CONFIG_DEBUG_SECTION_MISMATCH=y
> > + $(MAKE) -C $(P_KERNEL) M=$(P_PWD) modules
> > mkdir -p $(P_OUTPUT)
> > cp $(P_PWD)/p_lkrg.ko $(P_OUTPUT)
> >
> > install:
> > - $(MAKE) -C /lib/modules/$(P_KVER)/build M=$(P_PWD) modules_install
> > + $(MAKE) -C $(P_KERNEL) M=$(P_PWD) modules_install
> >
> > clean:
> > - $(MAKE) -C /lib/modules/$(P_KVER)/build M=$(P_PWD) clean
> > + $(MAKE) -C $(P_KERNEL) M=$(P_PWD) clean
> > $(RM) Module.markers modules.order
> > $(RM) $(P_PWD)/src/modules/kmod/client/kmod/Module.markers
> > $(RM) $(P_PWD)/src/modules/kmod/client/kmod/modules.order
> > --
> > 2.16.4
> >
>
> > From be24b4094662c931680b0eadc5dba1ddbebb36e2 Mon Sep 17 00:00:00 2001
> > From: Mikhail Klementev <jollheef@...eup.net>
> > Date: Sat, 1 Sep 2018 12:47:11 +0000
> > Subject: [PATCH 3/3] Include linux/profile.h for related defines
> >
> > ---
> > src/p_lkrg_main.h | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/src/p_lkrg_main.h b/src/p_lkrg_main.h
> > index f8744a2..525ad1f 100644
> > --- a/src/p_lkrg_main.h
> > +++ b/src/p_lkrg_main.h
> > @@ -43,6 +43,7 @@
> > #include <linux/inetdevice.h>
> > #include <linux/usb.h>
> > #include <linux/acpi.h>
> > +#include <linux/profile.h>
> >
> > #include <linux/kprobes.h>
> > #include <linux/namei.h>
> > --
> > 2.16.4
> >
>
>
>
>
> --
> pi3 (pi3ki31ny) - pi3 (at) itsec pl
> http://pi3.com.pl
--
pi3 (pi3ki31ny) - pi3 (at) itsec pl
http://pi3.com.pl
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
