linux-stable.git/security/apparmor/include, branch linux-3.12.y

apparmor: fix module parameters can be changed after policy is locked

2017-01-27T10:16:15+00:00

commit 58acf9d911c8831156634a44d0b022d683e1e50c upstream.

the policy_lock parameter is a one way switch that prevents policy
from being further modified. Unfortunately some of the module parameters
can effectively modify policy by turning off enforcement.

split policy_admin_capable into a view check and a full admin check,
and update the admin check to test the policy_lock parameter.

Signed-off-by: John Johansen 
Signed-off-by: Jiri Slaby

apparmor: add missing id bounds check on dfa verification

2017-01-27T10:16:13+00:00

commit 15756178c6a65b261a080e21af4766f59cafc112 upstream.

Signed-off-by: John Johansen 
Signed-off-by: Jiri Slaby

nick kvfree() from apparmor

2015-04-27T17:59:54+00:00

commit 39f1f78d53b9bcbca91967380c5f0f2305a5c55f upstream.

too many places open-code it

Signed-off-by: Al Viro 
Signed-off-by: Jiri Slaby

apparmor: fix suspicious RCU usage warning in policy.c/policy.h

2013-09-29T23:54:01+00:00

The recent 3.12 pull request for apparmor was missing a couple rcu _protected
access modifiers. Resulting in the follow suspicious RCU usage

 [   29.804534] [ INFO: suspicious RCU usage. ]
 [   29.804539] 3.11.0+ #5 Not tainted
 [   29.804541] -------------------------------
 [   29.804545] security/apparmor/include/policy.h:363 suspicious rcu_dereference_check() usage!
 [   29.804548]
 [   29.804548] other info that might help us debug this:
 [   29.804548]
 [   29.804553]
 [   29.804553] rcu_scheduler_active = 1, debug_locks = 1
 [   29.804558] 2 locks held by apparmor_parser/1268:
 [   29.804560]  #0:  (sb_writers#9){.+.+.+}, at: [] file_start_write+0x27/0x29
 [   29.804576]  #1:  (&ns->lock){+.+.+.}, at: [] aa_replace_profiles+0x166/0x57c
 [   29.804589]
 [   29.804589] stack backtrace:
 [   29.804595] CPU: 0 PID: 1268 Comm: apparmor_parser Not tainted 3.11.0+ #5
 [   29.804599] Hardware name: ASUSTeK Computer Inc.         UL50VT          /UL50VT    , BIOS 217     03/01/2010
 [   29.804602]  0000000000000000 ffff8800b95a1d90 ffffffff8144eb9b ffff8800b94db540
 [   29.804611]  ffff8800b95a1dc0 ffffffff81087439 ffff880138cc3a18 ffff880138cc3a18
 [   29.804619]  ffff8800b9464a90 ffff880138cc3a38 ffff8800b95a1df0 ffffffff811f5084
 [   29.804628] Call Trace:
 [   29.804636]  [] dump_stack+0x4e/0x82
 [   29.804642]  [] lockdep_rcu_suspicious+0xfc/0x105
 [   29.804649]  [] __aa_update_replacedby+0x53/0x7f
 [   29.804655]  [] __replace_profile+0x11f/0x1ed
 [   29.804661]  [] aa_replace_profiles+0x410/0x57c
 [   29.804668]  [] profile_replace+0x35/0x4c
 [   29.804674]  [] vfs_write+0xad/0x113
 [   29.804680]  [] SyS_write+0x44/0x7a
 [   29.804687]  [] system_call_fastpath+0x16/0x1b
 [   29.804691]
 [   29.804694] ===============================
 [   29.804697] [ INFO: suspicious RCU usage. ]
 [   29.804700] 3.11.0+ #5 Not tainted
 [   29.804703] -------------------------------
 [   29.804706] security/apparmor/policy.c:566 suspicious rcu_dereference_check() usage!
 [   29.804709]
 [   29.804709] other info that might help us debug this:
 [   29.804709]
 [   29.804714]
 [   29.804714] rcu_scheduler_active = 1, debug_locks = 1
 [   29.804718] 2 locks held by apparmor_parser/1268:
 [   29.804721]  #0:  (sb_writers#9){.+.+.+}, at: [] file_start_write+0x27/0x29
 [   29.804733]  #1:  (&ns->lock){+.+.+.}, at: [] aa_replace_profiles+0x166/0x57c
 [   29.804744]
 [   29.804744] stack backtrace:
 [   29.804750] CPU: 0 PID: 1268 Comm: apparmor_parser Not tainted 3.11.0+ #5
 [   29.804753] Hardware name: ASUSTeK Computer Inc.         UL50VT          /UL50VT    , BIOS 217     03/01/2010
 [   29.804756]  0000000000000000 ffff8800b95a1d80 ffffffff8144eb9b ffff8800b94db540
 [   29.804764]  ffff8800b95a1db0 ffffffff81087439 ffff8800b95b02b0 0000000000000000
 [   29.804772]  ffff8800b9efba08 ffff880138cc3a38 ffff8800b95a1dd0 ffffffff811f4f94
 [   29.804779] Call Trace:
 [   29.804786]  [] dump_stack+0x4e/0x82
 [   29.804791]  [] lockdep_rcu_suspicious+0xfc/0x105
 [   29.804798]  [] aa_free_replacedby_kref+0x4d/0x62
 [   29.804804]  [] ? aa_put_namespace+0x17/0x17
 [   29.804810]  [] kref_put+0x36/0x40
 [   29.804816]  [] __replace_profile+0x13a/0x1ed
 [   29.804822]  [] aa_replace_profiles+0x410/0x57c
 [   29.804829]  [] profile_replace+0x35/0x4c
 [   29.804835]  [] vfs_write+0xad/0x113
 [   29.804840]  [] SyS_write+0x44/0x7a
 [   29.804847]  [] system_call_fastpath+0x16/0x1b

Reported-by: miles.lane@gmail.com
CC: paulmck@linux.vnet.ibm.com
Signed-off-by: John Johansen 
Signed-off-by: James Morris

apparmor: add the ability to report a sha1 hash of loaded policy

2013-08-14T18:42:08+00:00

Provide userspace the ability to introspect a sha1 hash value for each
profile currently loaded.

Signed-off-by: John Johansen 
Acked-by: Seth Arnold

apparmor: export set of capabilities supported by the apparmor module

2013-08-14T18:42:07+00:00

Signed-off-by: John Johansen 
Acked-by: Seth Arnold

apparmor: add an optional profile attachment string for profiles

2013-08-14T18:42:07+00:00

Add the ability to take in and report a human readable profile attachment
string for profiles so that attachment specifications can be easily
inspected.

Signed-off-by: John Johansen 
Acked-by: Seth Arnold

apparmor: add interface files for profiles and namespaces

2013-08-14T18:42:07+00:00

Add basic interface files to access namespace and profile information.
The interface files are created when a profile is loaded and removed
when the profile or namespace is removed.

Signed-off-by: John Johansen

apparmor: allow setting any profile into the unconfined state

2013-08-14T18:42:07+00:00

Allow emulating the default profile behavior from boot, by allowing
loading of a profile in the unconfined state into a new NS.

Signed-off-by: John Johansen 
Acked-by: Seth Arnold

apparmor: make free_profile available outside of policy.c

2013-08-14T18:42:06+00:00

Signed-off-by: John Johansen