Discussion:
[PATCH ghak81 V3a] fixup! audit: collect audit task parameters
Richard Guy Briggs
2018-05-17 17:20:09 UTC
Permalink
Enable fork.c compilation with audit disabled.

Signed-off-by: Richard Guy Briggs <***@redhat.com>
---
Hi Paul, this one got caught by the 0-day kbuildbot. Can you squash it
down if you haven't merged it yet?
---
kernel/fork.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/fork.c b/kernel/fork.c
index 92ab849..ff82928 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1713,7 +1713,9 @@ static __latent_entropy struct task_struct *copy_process(
p->start_time = ktime_get_ns();
p->real_start_time = ktime_get_boot_ns();
p->io_context = NULL;
+#ifdef CONFIG_AUDITSYSCALL
p->audit = NULL;
+#endif /* CONFIG_AUDITSYSCALL */
cgroup_fork(p);
#ifdef CONFIG_NUMA
p->mempolicy = mpol_dup(p->mempolicy);
--
1.8.3.1
Paul Moore
2018-05-18 00:29:23 UTC
Permalink
Post by Richard Guy Briggs
Enable fork.c compilation with audit disabled.
---
Hi Paul, this one got caught by the 0-day kbuildbot. Can you squash it
down if you haven't merged it yet?
See my comment in the original patch. I would just recommend
squashing this into the original patch the next time you post it.
Post by Richard Guy Briggs
---
kernel/fork.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/fork.c b/kernel/fork.c
index 92ab849..ff82928 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1713,7 +1713,9 @@ static __latent_entropy struct task_struct *copy_process(
p->start_time = ktime_get_ns();
p->real_start_time = ktime_get_boot_ns();
p->io_context = NULL;
+#ifdef CONFIG_AUDITSYSCALL
p->audit = NULL;
+#endif /* CONFIG_AUDITSYSCALL */
cgroup_fork(p);
#ifdef CONFIG_NUMA
p->mempolicy = mpol_dup(p->mempolicy);
--
1.8.3.1
--
paul moore
www.paul-moore.com
Ingo Molnar
2018-05-18 06:02:33 UTC
Permalink
Post by Richard Guy Briggs
Enable fork.c compilation with audit disabled.
---
Hi Paul, this one got caught by the 0-day kbuildbot. Can you squash it
down if you haven't merged it yet?
---
kernel/fork.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/fork.c b/kernel/fork.c
index 92ab849..ff82928 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1713,7 +1713,9 @@ static __latent_entropy struct task_struct *copy_process(
p->start_time = ktime_get_ns();
p->real_start_time = ktime_get_boot_ns();
p->io_context = NULL;
+#ifdef CONFIG_AUDITSYSCALL
p->audit = NULL;
+#endif /* CONFIG_AUDITSYSCALL */
Please, simply use:

#endif

the comment is used for (much) larger blocks, to make it clear which block ends
there if the top is not visible.

Thanks,

Ingo

Loading...