On Friday, December 12, 2014 12:20:15 AM Richard Guy Briggs wrote:
> Should have been removed with 18900909.
>
> Signed-off-by: Richard Guy Briggs <[email protected]>
> ---
> include/linux/audit.h | 1 -
> kernel/auditfilter.c | 2 --
> 2 files changed, 0 insertions(+), 3 deletions(-)
Thanks. I still need to review 2/2 of this patchset, but this patch is
standalone from my perspective so I'm merging it now.
One note for future submissions, instead of saying "removed with XXXX", a
little more description can be helpful, e.g. "removed by commit XXXX ("audit:
make it suck less")". Documentation/SubmittingPatches has more text on this
in section 2. I myself am not perfect on this either so I'll rarely refuse a
patch for this reason, but it makes me happy when I see it done correctly :)
> diff --git a/include/linux/audit.h b/include/linux/audit.h
> index 36dffec..eefc39a 100644
> --- a/include/linux/audit.h
> +++ b/include/linux/audit.h
> @@ -46,7 +46,6 @@ struct audit_tree;
> struct sk_buff;
>
> struct audit_krule {
> - int vers_ops;
> u32 flags;
> u32 listnr;
> u32 action;
> diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
> index 40ed981..fb4d2df 100644
> --- a/kernel/auditfilter.c
> +++ b/kernel/auditfilter.c
> @@ -425,7 +425,6 @@ static struct audit_entry *audit_data_to_entry(struct
> audit_rule_data *data, goto exit_nofree;
>
> bufp = data->buf;
> - entry->rule.vers_ops = 2;
> for (i = 0; i < data->field_count; i++) {
> struct audit_field *f = &entry->rule.fields[i];
>
> @@ -762,7 +761,6 @@ struct audit_entry *audit_dupe_rule(struct audit_krule
> *old) return ERR_PTR(-ENOMEM);
>
> new = &entry->rule;
> - new->vers_ops = old->vers_ops;
> new->flags = old->flags;
> new->listnr = old->listnr;
> new->action = old->action;
--
paul moore
security and virtualization @ redhat
--
Linux-audit mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/linux-audit
