diff options
| -rw-r--r-- | meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-security/audit/audit_3.0.8.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch new file mode 100644 index 0000000000..c2080e156d --- /dev/null +++ b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 9 Aug 2022 23:57:03 -0700 | ||
| 4 | Subject: [PATCH] Replace __attribute_malloc__ with | ||
| 5 | __attribute__((__malloc__)) | ||
| 6 | |||
| 7 | __attribute_malloc__ is not available on musl | ||
| 8 | |||
| 9 | Fixes | ||
| 10 | | ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator | ||
| 11 | | __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); | ||
| 12 | | ^ | ||
| 13 | |||
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 15 | --- | ||
| 16 | auparse/auparse.h | 2 +- | ||
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/auparse/auparse.h b/auparse/auparse.h | ||
| 20 | index 95cf256d..c7dbe5ff 100644 | ||
| 21 | --- a/auparse/auparse.h | ||
| 22 | +++ b/auparse/auparse.h | ||
| 23 | @@ -51,7 +51,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, | ||
| 24 | void auparse_destroy(auparse_state_t *au); | ||
| 25 | void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what); | ||
| 26 | auparse_state_t *auparse_init(ausource_t source, const void *b) | ||
| 27 | - __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); | ||
| 28 | + __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1); | ||
| 29 | int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len) | ||
| 30 | __attr_access ((__read_only__, 2, 3)); | ||
| 31 | int auparse_feed(auparse_state_t *au, const char *data, size_t data_len) | ||
| 32 | -- | ||
| 33 | 2.37.1 | ||
| 34 | |||
diff --git a/meta-oe/recipes-security/audit/audit_3.0.8.bb b/meta-oe/recipes-security/audit/audit_3.0.8.bb index 3dbfc9e604..28d7d01764 100644 --- a/meta-oe/recipes-security/audit/audit_3.0.8.bb +++ b/meta-oe/recipes-security/audit/audit_3.0.8.bb | |||
| @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ | 10 | SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ |
| 11 | file://Fixed-swig-host-contamination-issue.patch \ | 11 | file://Fixed-swig-host-contamination-issue.patch \ |
| 12 | file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch \ | ||
| 12 | file://auditd \ | 13 | file://auditd \ |
| 13 | file://auditd.service \ | 14 | file://auditd.service \ |
| 14 | file://audit-volatile.conf \ | 15 | file://audit-volatile.conf \ |
