Re: [RFC PATCH 2/3] fixup! audit: remove arch_f pointer from struct audit_krule
On 2018-02-15 15:43, Paul Moore wrote: > On Mon, Feb 12, 2018 at 7:29 AM, Richard Guy Briggs wrote: > > Signed-off-by: Richard Guy Briggs > > --- > > kernel/auditfilter.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > I realize this is an RFC patchset, but considering recent patchsets I > feel some clarification might be helpful to prevent future delays ... > when submitting patchsets for merging please do not submit "fixup!" > patches which fix problems in patches that are submitted earlier in > the patchset, simply merge/squash the "fixup!" patches before > submitting. Yeah, the only reason this is a "fixup!" patch is to clearly show what remedial step was (surprisingly) needed to fix the bug. Same with the following "debug!" annotation. Clearly not intended for upstream to Linus. > > diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c > > index 3343d1c..48dcb59 100644 > > --- a/kernel/auditfilter.c > > +++ b/kernel/auditfilter.c > > @@ -221,11 +221,13 @@ static inline int audit_match_class_bits(int class, > > u32 *mask) > > static int audit_match_signal(struct audit_entry *entry) > > { > > int i; > > + u32 archval; > > struct audit_field *arch; > > > > for (i = 0; i < entry->rule.field_count; i++) > > if (entry->rule.fields[i].type == AUDIT_ARCH) { > > arch = &entry->rule.fields[i]; > > + archval = arch->val; > > break; > > } > > > > @@ -238,7 +240,7 @@ static int audit_match_signal(struct audit_entry *entry) > >entry->rule.mask)); > > } > > > > - switch(audit_classify_arch(arch->val)) { > > + switch(audit_classify_arch(archval)) { > > case 0: /* native */ > > return (audit_match_class_bits(AUDIT_CLASS_SIGNAL, > >entry->rule.mask)); > > -- > > 1.8.3.1 > > paul moore - RGB -- Richard Guy Briggs Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada IRC: rgb, SunRaycer Voice: +1.647.777.2635, Internal: (81) 32635 -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit
Re: [RFC PATCH 2/3] fixup! audit: remove arch_f pointer from struct audit_krule
On Mon, Feb 12, 2018 at 7:29 AM, Richard Guy Briggs wrote: > Signed-off-by: Richard Guy Briggs > --- > kernel/auditfilter.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) I realize this is an RFC patchset, but considering recent patchsets I feel some clarification might be helpful to prevent future delays ... when submitting patchsets for merging please do not submit "fixup!" patches which fix problems in patches that are submitted earlier in the patchset, simply merge/squash the "fixup!" patches before submitting. > diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c > index 3343d1c..48dcb59 100644 > --- a/kernel/auditfilter.c > +++ b/kernel/auditfilter.c > @@ -221,11 +221,13 @@ static inline int audit_match_class_bits(int class, u32 > *mask) > static int audit_match_signal(struct audit_entry *entry) > { > int i; > + u32 archval; > struct audit_field *arch; > > for (i = 0; i < entry->rule.field_count; i++) > if (entry->rule.fields[i].type == AUDIT_ARCH) { > arch = &entry->rule.fields[i]; > + archval = arch->val; > break; > } > > @@ -238,7 +240,7 @@ static int audit_match_signal(struct audit_entry *entry) >entry->rule.mask)); > } > > - switch(audit_classify_arch(arch->val)) { > + switch(audit_classify_arch(archval)) { > case 0: /* native */ > return (audit_match_class_bits(AUDIT_CLASS_SIGNAL, >entry->rule.mask)); > -- > 1.8.3.1 > -- paul moore www.paul-moore.com -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit
[RFC PATCH 2/3] fixup! audit: remove arch_f pointer from struct audit_krule
Signed-off-by: Richard Guy Briggs --- kernel/auditfilter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 3343d1c..48dcb59 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -221,11 +221,13 @@ static inline int audit_match_class_bits(int class, u32 *mask) static int audit_match_signal(struct audit_entry *entry) { int i; + u32 archval; struct audit_field *arch; for (i = 0; i < entry->rule.field_count; i++) if (entry->rule.fields[i].type == AUDIT_ARCH) { arch = &entry->rule.fields[i]; + archval = arch->val; break; } @@ -238,7 +240,7 @@ static int audit_match_signal(struct audit_entry *entry) entry->rule.mask)); } - switch(audit_classify_arch(arch->val)) { + switch(audit_classify_arch(archval)) { case 0: /* native */ return (audit_match_class_bits(AUDIT_CLASS_SIGNAL, entry->rule.mask)); -- 1.8.3.1 -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit