[dm-devel] [PATCH] audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering

[Paul Moore]

On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul at paul-moore.com> wrote:
>
> Due to conflict with the audit and SELinux trees the device mapper
> audit record types need to be renumbered before landing in Linus'
> tree.
>
> Link: https://lore.kernel.org/lkml/CAHC9VhTLmzDQPqsj+vyBNua1X13UK_tTcixKZ7WWYEqMXVOXdQ@mail.gmail.com/
> Fixes: c1d7fa96e74b ("dm: introduce audit event module for device mapper")
> Signed-off-by: Paul Moore <paul at paul-moore.com>
> ---
>  include/uapi/linux/audit.h |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Alasdair or Mike, please merge this into the device-mapper tree before
you send it to Linus during the upcoming merge window.

> diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> index 6650ab6def2a..809e4c2041b3 100644
> --- a/include/uapi/linux/audit.h
> +++ b/include/uapi/linux/audit.h
> @@ -118,8 +118,8 @@
>  #define AUDIT_TIME_ADJNTPVAL   1333    /* NTP value adjustment */
>  #define AUDIT_BPF              1334    /* BPF subsystem */
>  #define AUDIT_EVENT_LISTENER   1335    /* Task joined multicast read socket */
> -#define AUDIT_DM_CTRL          1336    /* Device Mapper target control */
> -#define AUDIT_DM_EVENT         1337    /* Device Mapper events */
> +#define AUDIT_DM_CTRL          1338    /* Device Mapper target control */
> +#define AUDIT_DM_EVENT         1339    /* Device Mapper events */
>
>  #define AUDIT_AVC              1400    /* SE Linux avc denial or grant */
>  #define AUDIT_SELINUX_ERR      1401    /* Internal SE Linux Errors */

-- 
paul moore
www.paul-moore.com