blob: a82d27d9cffc286d789d7b184c22b1608db01c4d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 8defe4bcb2f37e39d9d10300af82f8c62b7be84f Mon Sep 17 00:00:00 2001
From: Patrick Steinhardt <ps@pks.im>
Date: Thu, 26 Apr 2018 14:51:43 +0100
Subject: [PATCH 02/11] libapparmor: make `aa_policy_cache_add_ro_dir` function
visible
While the parser makes use of the `aa_policy_cache_add_ro_dir` function,
it is not being declared as a global function in the libapparmor.map
file. Due to this, dynamic linking of apparmor_parser with
libapparmor.so is not possible.
[Fixed up to use 2.13.1 symbol section as when the
`aa_policy_cache_add_ro_dir` was introduced -- @smb]
(cherry picked from commit 1506f2cf0e89b0a04154c64ec058ab0f5541692e)
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Steve Beattie <steve.beattie@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
PR: https://gitlab.com/apparmor/apparmor/merge_requests/107
---
libraries/libapparmor/src/libapparmor.map | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map
index 1ca2bd6b..f5b55836 100644
--- a/libraries/libapparmor/src/libapparmor.map
+++ b/libraries/libapparmor/src/libapparmor.map
@@ -108,6 +108,13 @@ APPARMOR_2.13 {
*;
} APPARMOR_2.11;
+APPARMOR_2.13.1 {
+ global:
+ aa_policy_cache_add_ro_dir;
+ local:
+ *;
+} APPARMOR_2.13;
+
PRIVATE {
global:
_aa_is_blacklisted;
--
2.17.1
|
