4:19 a.m.
This is v3 of the previous series, adding another patch (patch 1),
fixing build errors reported by Lianbo.
v2: https://listman.redhat.com/archives/crash-utility/2023-September/011020.html
Please apply!
Thanks,
Mathias
Mathias Krause (3):
memory_driver: Ensure PWD points to the current directory
memory_driver: Use designated initializer for 'crash_dev'
memory_driver: Support overriding kernel directory
memory_driver/Makefile | 10 ++++++++--
memory_driver/crash.c | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)
--
2.30.2
4:19 a.m.
New subject: [PATCH v3 1/3] memory_driver: Ensure PWD points to the current directory
Building crash.ko broke in commit 74ac92971241 ("Support for multiple
jobs to build crash"), as PWD won't be updated on recursive calls to
'make' and will still point to the upper directory.
This leads to the 'all' target trying to build modules in the top level
directory -- where there are none.
Fix that by updating PWD to the current directory.
Fixes: 74ac92971241 ("Support for multiple jobs to build crash")
Reported-by: Lianbo Jiang <lijiang(a)redhat.com>
Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
---
memory_driver/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/memory_driver/Makefile b/memory_driver/Makefile
index b494aa3cd184..d0f3ccc912f4 100644
--- a/memory_driver/Makefile
+++ b/memory_driver/Makefile
@@ -9,6 +9,7 @@
# GNU General Public License for more details.
#
obj-m := crash.o
+PWD := $(shell pwd)
all:
make -C /lib/modules/`uname -r`/build M=${PWD} SUBDIRS=${PWD} modules
clean:
--
2.30.2
4:19 a.m.
New subject: [PATCH v3 2/3] memory_driver: Use designated initializer for 'crash_dev'
Instead of using positional initialization, use the more modern
designated initializer style, as already used for 'crash_fops'.
This makes the member initialization not only less ambiguous but also
allows structure layout randomization of the underlying type (as done in
grsecurity).
Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
---
memory_driver/crash.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/memory_driver/crash.c b/memory_driver/crash.c
index 81bd0e5c1aec..4999ed4113b7 100644
--- a/memory_driver/crash.c
+++ b/memory_driver/crash.c
@@ -324,9 +324,9 @@ static struct file_operations crash_fops = {
};
static struct miscdevice crash_dev = {
- MISC_DYNAMIC_MINOR,
- "crash",
- &crash_fops
+ .minor = MISC_DYNAMIC_MINOR,
+ .name = "crash",
+ .fops = &crash_fops
};
static int __init
--
2.30.2
4:19 a.m.
New subject: [PATCH v3 3/3] memory_driver: Support overriding kernel directory
Support compiling the module against a different kernel version than the
currently running one by allowing to set either KVER or KDIR variables
on the make commandline.
Also modernize the makefile slightly and make use of the kernel's
'clean' target to ensure to remove all generated files.
Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
---
memory_driver/Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/memory_driver/Makefile b/memory_driver/Makefile
index d0f3ccc912f4..61ee7c03e858 100644
--- a/memory_driver/Makefile
+++ b/memory_driver/Makefile
@@ -8,9 +8,14 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
+ifneq ($(KERNELRELEASE),)
obj-m := crash.o
+else
PWD := $(shell pwd)
+KVER ?= $(shell uname -r)
+KDIR ?= /lib/modules/${KVER}/build
all:
- make -C /lib/modules/`uname -r`/build M=${PWD} SUBDIRS=${PWD} modules
+ ${MAKE} -C ${KDIR} M=${PWD} SUBDIRS=${PWD} modules
clean:
- rm -f *.mod.c *.ko *.o Module.*
+ test -e ${KDIR}/Makefile && ${MAKE} -C ${KDIR} M=${PWD} SUBDIRS=${PWD} clean ||
${RM} *.mod.c *.ko *.o Module.*
+endif
--
2.30.2
9:47 p.m.
New subject: [PATCH v3 3/3] memory_driver: Support overriding kernel directory
Hi Mathias,
thank you for the patch set, looks good.
On 2023/09/28 18:19, Mathias Krause wrote:
Support compiling the module against a different kernel version than
the
currently running one by allowing to set either KVER or KDIR variables
on the make commandline.
Also modernize the makefile slightly and make use of the kernel's
'clean' target to ensure to remove all generated files.
Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
---
memory_driver/Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/memory_driver/Makefile b/memory_driver/Makefile
index d0f3ccc912f4..61ee7c03e858 100644
--- a/memory_driver/Makefile
+++ b/memory_driver/Makefile
@@ -8,9 +8,14 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
+ifneq ($(KERNELRELEASE),)
Only one question, is this for to build the module in a customized
kernel tree?
Thanks,
Kazu
> obj-m := crash.o
> +else
> PWD := $(shell pwd)
> +KVER ?= $(shell uname -r)
> +KDIR ?= /lib/modules/${KVER}/build
> all:
> - make -C /lib/modules/`uname -r`/build M=${PWD} SUBDIRS=${PWD} modules
> + ${MAKE} -C ${KDIR} M=${PWD} SUBDIRS=${PWD} modules
> clean:
> - rm -f *.mod.c *.ko *.o Module.*
> + test -e ${KDIR}/Makefile && ${MAKE} -C ${KDIR} M=${PWD} SUBDIRS=${PWD}
clean || ${RM} *.mod.c *.ko *.o Module.*
> +endif
1:53 a.m.
New subject: [PATCH v3 3/3] memory_driver: Support overriding kernel directory
Hagio-san,
On 05.10.23 04:47, HAGIO KAZUHITO(萩尾 一仁) wrote:
Hi Mathias,
thank you for the patch set, looks good.
On 2023/09/28 18:19, Mathias Krause wrote:
> Support compiling the module against a different kernel version than the
> currently running one by allowing to set either KVER or KDIR variables
> on the make commandline.
>
> Also modernize the makefile slightly and make use of the kernel's
> 'clean' target to ensure to remove all generated files.
>
> Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
> ---
> memory_driver/Makefile | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/memory_driver/Makefile b/memory_driver/Makefile
> index d0f3ccc912f4..61ee7c03e858 100644
> --- a/memory_driver/Makefile
> +++ b/memory_driver/Makefile
> @@ -8,9 +8,14 @@
> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> # GNU General Public License for more details.
> #
> +ifneq ($(KERNELRELEASE),)
Only one question, is this for to build the module in a customized
kernel tree?
It's the common pattern for external module Makefiles, making use of the
kernel's build infrastructure (see [1]). $(KERNELRELEASE) will be set
when this Makefile gets parsed again by kbuild, making it possible to
distinguish its dual use and avoiding make targets to lash with kernel
internal ones.
Thanks,
Mathias
[1]
https://docs.kernel.org/kbuild/modules.html?highlight=kernelrelease#share...
2:40 a.m.
New subject: [PATCH v3 3/3] memory_driver: Support overriding kernel directory
On 2023/10/05 15:53, Mathias Krause wrote:
Hagio-san,
On 05.10.23 04:47, HAGIO KAZUHITO(萩尾 一仁) wrote:
> Hi Mathias,
>
> thank you for the patch set, looks good.
>
> On 2023/09/28 18:19, Mathias Krause wrote:
>> Support compiling the module against a different kernel version than the
>> currently running one by allowing to set either KVER or KDIR variables
>> on the make commandline.
>>
>> Also modernize the makefile slightly and make use of the kernel's
>> 'clean' target to ensure to remove all generated files.
>>
>> Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
>> ---
>> memory_driver/Makefile | 9 +++++++--
>> 1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/memory_driver/Makefile b/memory_driver/Makefile
>> index d0f3ccc912f4..61ee7c03e858 100644
>> --- a/memory_driver/Makefile
>> +++ b/memory_driver/Makefile
>> @@ -8,9 +8,14 @@
>> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> # GNU General Public License for more details.
>> #
>> +ifneq ($(KERNELRELEASE),)
>
> Only one question, is this for to build the module in a customized
> kernel tree?
It's the common pattern for external module Makefiles, making use of the
kernel's build infrastructure (see [1]). $(KERNELRELEASE) will be set
when this Makefile gets parsed again by kbuild, making it possible to
distinguish its dual use and avoiding make targets to lash with kernel
internal ones.
oh, I see. I've not seen such a module Makefile, thank you for the
information. Question cleared,
Acked-by: Kazuhito Hagio <k-hagio-ab(a)nec.com>
Thanks,
Kazu
>
> Thanks,
> Mathias
>
> [1]
> https://docs.kernel.org/kbuild/modules.html?highlight=kernelrelease#share...
10:06 p.m.
Thank you for the update, Mathias.
On Thu, Sep 28, 2023 at 5:19 PM Mathias Krause <minipli(a)grsecurity.net>
wrote:
This is v3 of the previous series, adding another patch (patch 1),
fixing build errors reported by Lianbo.
v2:
https://listman.redhat.com/archives/crash-utility/2023-September/011020.html
Please apply!
For the v3 patchset, this looks good to me, so: Ack.
Thanks
Lianbo
Thanks,
Mathias
Mathias Krause (3):
memory_driver: Ensure PWD points to the current directory
memory_driver: Use designated initializer for 'crash_dev'
memory_driver: Support overriding kernel directory
memory_driver/Makefile | 10 ++++++++--
memory_driver/crash.c | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)
--
2.30.2
11:41 p.m.
On 2023/10/07 12:06, lijiang wrote:
Thank you for the update, Mathias.
On Thu, Sep 28, 2023 at 5:19 PM Mathias Krause <minipli(a)grsecurity.net>
wrote:
> This is v3 of the previous series, adding another patch (patch 1),
> fixing build errors reported by Lianbo.
>
> v2:
> https://listman.redhat.com/archives/crash-utility/2023-September/011020.html
>
> Please apply!
>
>
For the v3 patchset, this looks good to me, so: Ack.
Thanks, applied.
Kazu
444
days inactive
456
days old
devel@lists.crash-utility.osci.io
8 comments
3 participants
participants (3)
-
HAGIO KAZUHITO(萩尾 一仁) -
lijiang -
Mathias Krause