mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-03 07:45:50 +00:00
Merge Fix ABI break for aa_log_record
Commit 3c825eb001
adds a field called `execpath` to the `aa_log_record` struct. This field was added in the middle of the struct instead of the end, causing an ABI break in libapparmor without a corresponding major version number bump.
Bug report: https://bugs.launchpad.net/apparmor/+bug/2083435
This is fixed by simply moving execpath at the end of the struct.
Signed-off-by: Maxime Bélair <maxime.belair@canonical.com>
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1345
Approved-by: Ryan Lee <rlee287@yahoo.com>
Approved-by: John Johansen <john@jjmx.net>
Merged-by: John Johansen <john@jjmx.net>
This commit is contained in:
@@ -86,8 +86,6 @@ typedef struct
|
|||||||
char *net_foreign_addr;
|
char *net_foreign_addr;
|
||||||
unsigned long net_foreign_port;
|
unsigned long net_foreign_port;
|
||||||
|
|
||||||
char *execpath;
|
|
||||||
|
|
||||||
char *dbus_bus;
|
char *dbus_bus;
|
||||||
char *dbus_path;
|
char *dbus_path;
|
||||||
char *dbus_interface;
|
char *dbus_interface;
|
||||||
@@ -104,6 +102,7 @@ typedef struct
|
|||||||
|
|
||||||
char *net_addr;
|
char *net_addr;
|
||||||
char *peer_addr;
|
char *peer_addr;
|
||||||
|
char *execpath;
|
||||||
} aa_log_record;
|
} aa_log_record;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user