linux-stable.git/security/apparmor, branch linux-3.10.y

apparmor: do not expose kernel stack

2017-06-20T12:04:13+00:00

commit f4ee2def2d70692ccff0d55353df4ee594fd0017 upstream.

Do not copy uninitalized fields th.td_hilen, th.td_data.

Signed-off-by: Heinrich Schuchardt 
Signed-off-by: John Johansen 
Signed-off-by: Jiri Slaby 
Signed-off-by: Willy Tarreau

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

2017-06-20T12:04:13+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: Willy Tarreau

apparmor: fix oops in profile_unpack() when policy_db is not present

2017-06-20T12:04:12+00:00

commit 5f20fdfed16bc599a325a145bf0123a8e1c9beea upstream.

BugLink: http://bugs.launchpad.net/bugs/1592547

If unpack_dfa() returns NULL due to the dfa not being present,
profile_unpack() is not checking if the dfa is not present (NULL).

Signed-off-by: John Johansen 
Signed-off-by: Willy Tarreau

apparmor: don't check for vmalloc_addr if kvzalloc() failed

2017-06-20T12:04:12+00:00

commit 3197f5adf539a3ee6331f433a51483f8c842f890 upstream.

Signed-off-by: John Johansen 
Signed-off-by: Willy Tarreau

apparmor: add missing id bounds check on dfa verification

2017-06-20T12:04:12+00:00

commit 15756178c6a65b261a080e21af4766f59cafc112 upstream.

Signed-off-by: John Johansen 
Signed-off-by: Willy Tarreau

apparmor: check that xindex is in trans_table bounds

2017-06-20T12:04:12+00:00

commit 23ca7b640b4a55f8747301b6bd984dd05545f6a7 upstream.

Signed-off-by: John Johansen 
Acked-by: Seth Arnold 
Signed-off-by: Jiri Slaby 
Signed-off-by: Willy Tarreau

apparmor: internal paths should be treated as disconnected

2017-06-20T12:04:11+00:00

commit bd35db8b8ca6e27fc17a9057ef78e1ddfc0de351 upstream.

Internal mounts are not mounted anywhere and as such should be treated
as disconnected paths.

Signed-off-by: John Johansen 
Acked-by: Seth Arnold 
Signed-off-by: Jiri Slaby 
Signed-off-by: Willy Tarreau

apparmor: fix disconnected bind mnts reconnection

2017-06-20T12:04:11+00:00

commit f2e561d190da7ff5ee265fa460e2d7f753dddfda upstream.

Bind mounts can fail to be properly reconnected when PATH_CONNECT is
specified. Ensure that when PATH_CONNECT is specified the path has
a root.

BugLink: http://bugs.launchpad.net/bugs/1319984

Signed-off-by: John Johansen 
Acked-by: Seth Arnold 
Signed-off-by: Jiri Slaby 
Signed-off-by: Willy Tarreau

apparmor: exec should not be returning ENOENT when it denies

2017-06-20T12:04:11+00:00

commit 9049a7922124d843a2cd26a02b1d00a17596ec0c upstream.

The current behavior is confusing as it causes exec failures to report
the executable is missing instead of identifying that apparmor
caused the failure.

Signed-off-by: John Johansen 
Acked-by: Seth Arnold 
Signed-off-by: Jiri Slaby 
Signed-off-by: Willy Tarreau

apparmor: fix uninitialized lsm_audit member

2017-06-20T12:04:10+00:00

commit b6b1b81b3afba922505b57f4c812bba022f7c4a9 upstream.

BugLink: http://bugs.launchpad.net/bugs/1268727

The task field in the lsm_audit struct needs to be initialized if
a change_hat fails, otherwise the following oops will occur

BUG: unable to handle kernel paging request at 0000002fbead7d08
IP: [] _raw_spin_lock+0xe/0x50
PGD 1e3f35067 PUD 0
Oops: 0002 [#1] SMP
Modules linked in: pppox crc_ccitt p8023 p8022 psnap llc ax25 btrfs raid6_pq xor xfs libcrc32c dm_multipath scsi_dh kvm_amd dcdbas kvm microcode amd64_edac_mod joydev edac_core psmouse edac_mce_amd serio_raw k10temp sp5100_tco i2c_piix4 ipmi_si ipmi_msghandler acpi_power_meter mac_hid lp parport hid_generic usbhid hid pata_acpi mpt2sas ahci raid_class pata_atiixp bnx2 libahci scsi_transport_sas [last unloaded: tipc]
CPU: 2 PID: 699 Comm: changehat_twice Tainted: GF          O 3.13.0-7-generic #25-Ubuntu
Hardware name: Dell Inc. PowerEdge R415/08WNM9, BIOS 1.8.6 12/06/2011
task: ffff8802135c6000 ti: ffff880212986000 task.ti: ffff880212986000
RIP: 0010:[]  [] _raw_spin_lock+0xe/0x50
RSP: 0018:ffff880212987b68  EFLAGS: 00010006
RAX: 0000000000020000 RBX: 0000002fbead7500 RCX: 0000000000000000
RDX: 0000000000000292 RSI: ffff880212987ba8 RDI: 0000002fbead7d08
RBP: ffff880212987b68 R08: 0000000000000246 R09: ffff880216e572a0
R10: ffffffff815fd677 R11: ffffea0008469580 R12: ffffffff8130966f
R13: ffff880212987ba8 R14: 0000002fbead7d08 R15: ffff8800d8c6b830
FS:  00002b5e6c84e7c0(0000) GS:ffff880216e40000(0000) knlGS:0000000055731700
CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000002fbead7d08 CR3: 000000021270f000 CR4: 00000000000006e0
Stack:
 ffff880212987b98 ffffffff81075f17 ffffffff8130966f 0000000000000009
 0000000000000000 0000000000000000 ffff880212987bd0 ffffffff81075f7c
 0000000000000292 ffff880212987c08 ffff8800d8c6b800 0000000000000026
Call Trace:
 [] __lock_task_sighand+0x47/0x80
 [] ? apparmor_cred_prepare+0x2f/0x50
 [] do_send_sig_info+0x2c/0x80
 [] send_sig_info+0x1e/0x30
 [] aa_audit+0x13d/0x190
 [] aa_audit_file+0xbc/0x130
 [] ? apparmor_cred_prepare+0x2f/0x50
 [] aa_change_hat+0x202/0x530
 [] aa_setprocattr_changehat+0x116/0x1d0
 [] apparmor_setprocattr+0x25d/0x300
 [] security_setprocattr+0x16/0x20
 [] proc_pid_attr_write+0x107/0x130
 [] vfs_write+0xb4/0x1f0
 [] SyS_write+0x49/0xa0
 [] tracesys+0xe1/0xe6

Signed-off-by: John Johansen 
Acked-by: Seth Arnold 
Acked-by: Jeff Mahoney 
Signed-off-by: Jiri Slaby 
Signed-off-by: Willy Tarreau