| Message ID | 163469252421.3058604.4246950335082826987.stgit@olly (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Mike Snitzer |
| Headers | show |
| Series | audit: correct the AUDIT_DM_CTRL and AUDIT_DM_EVENT numbering | expand |
On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul@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@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 */
On Tue, Oct 19, 2021 at 9:17 PM Paul Moore <paul@paul-moore.com> wrote: > On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul@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@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. Please merge this fix into the device-mapper tree to fix a patch in the for-next branch, otherwise there is a chance for breakage due to potentially botched merges 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 */
On Tue, Oct 26 2021 at 10:22P -0400, Paul Moore <paul@paul-moore.com> wrote: > On Tue, Oct 19, 2021 at 9:17 PM Paul Moore <paul@paul-moore.com> wrote: > > On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul@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@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. > > Please merge this fix into the device-mapper tree to fix a patch in > the for-next branch, otherwise there is a chance for breakage due to > potentially botched merges during the upcoming merge window. I fixed it up.. via rebase, so we should be all set. Thanks, Mike -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
On Wed, Oct 27, 2021 at 4:57 PM Mike Snitzer <snitzer@redhat.com> wrote: > > On Tue, Oct 26 2021 at 10:22P -0400, > Paul Moore <paul@paul-moore.com> wrote: > > > On Tue, Oct 19, 2021 at 9:17 PM Paul Moore <paul@paul-moore.com> wrote: > > > On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul@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@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. > > > > Please merge this fix into the device-mapper tree to fix a patch in > > the for-next branch, otherwise there is a chance for breakage due to > > potentially botched merges during the upcoming merge window. > > I fixed it up.. via rebase, so we should be all set. Great, thanks Mike.
On 2021-10-27 17:21, Paul Moore wrote: > On Wed, Oct 27, 2021 at 4:57 PM Mike Snitzer <snitzer@redhat.com> wrote: > > > > On Tue, Oct 26 2021 at 10:22P -0400, > > Paul Moore <paul@paul-moore.com> wrote: > > > > > On Tue, Oct 19, 2021 at 9:17 PM Paul Moore <paul@paul-moore.com> wrote: > > > > On Tue, Oct 19, 2021 at 9:15 PM Paul Moore <paul@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@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. > > > > > > Please merge this fix into the device-mapper tree to fix a patch in > > > the for-next branch, otherwise there is a chance for breakage due to > > > potentially botched merges during the upcoming merge window. > > > > I fixed it up.. via rebase, so we should be all set. > > Great, thanks Mike. The code got updated, which is the important part, but the description didn't. :-/ > paul moore - RGB -- Richard Guy Briggs <rgb@redhat.com> 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 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
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 */
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@paul-moore.com> --- include/uapi/linux/audit.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel