mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
bdea9e5678
The is_merged_x_consistend macro was incorrect in that is tested for USER_EXEC_TYPE to determine if there was an x transition. This fails for unconfined execs so an unconfined exec would not correctly conflict with another exec type. The dfa match flag table for xtransitions was not large enough and not indexed properly for pux, and cux transitions. The index calculation did not take into account the pux flag so that pux and px aliased to the same location and cux and cx aliased to the same location. This would result in the first rule being processed defining what the transition type was for all following rules of the type following. So if a px transition was processed first all pux, transitions in the profile would be treated pux. Signed-off-by: John Johansen <john.johansen@canonical.com>
164 lines
5.2 KiB
C
164 lines
5.2 KiB
C
/*
|
|
* Copyright (c) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
|
|
* NOVELL (All rights reserved)
|
|
*
|
|
* Immunix AppArmor LSM
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation, version 2 of the
|
|
* License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, contact Novell, Inc.
|
|
*/
|
|
|
|
#ifndef _IMMUNIX_H
|
|
#define _IMMUNIX_H
|
|
|
|
/*
|
|
* Modeled after MAY_READ, MAY_WRITE, MAY_EXEC in the kernel. The value of
|
|
* AA_MAY_EXEC must be identical to MAY_EXEC, etc.
|
|
*/
|
|
#define AA_MAY_EXEC (1 << 0)
|
|
#define AA_MAY_WRITE (1 << 1)
|
|
#define AA_MAY_READ (1 << 2)
|
|
#define AA_MAY_APPEND (1 << 3)
|
|
#define AA_MAY_LINK (1 << 4)
|
|
#define AA_MAY_LOCK (1 << 5)
|
|
#define AA_EXEC_MMAP (1 << 6)
|
|
#define AA_EXEC_PUX (1 << 7)
|
|
#define AA_EXEC_UNSAFE (1 << 8)
|
|
#define AA_EXEC_INHERIT (1 << 9)
|
|
#define AA_EXEC_MOD_0 (1 << 10)
|
|
#define AA_EXEC_MOD_1 (1 << 11)
|
|
#define AA_EXEC_MOD_2 (1 << 12)
|
|
#define AA_EXEC_MOD_3 (1 << 13)
|
|
|
|
#define AA_BASE_PERMS (AA_MAY_EXEC | AA_MAY_WRITE | \
|
|
AA_MAY_READ | AA_MAY_APPEND | \
|
|
AA_MAY_LINK | AA_MAY_LOCK | \
|
|
AA_EXEC_PUX | AA_EXEC_MMAP | \
|
|
AA_EXEC_UNSAFE | AA_EXEC_INHERIT | \
|
|
AA_EXEC_MOD_0 | AA_EXEC_MOD_1 | \
|
|
AA_EXEC_MOD_2 | AA_EXEC_MOD_3)
|
|
|
|
#define AA_USER_SHIFT 0
|
|
#define AA_OTHER_SHIFT 14
|
|
|
|
#define AA_USER_PERMS (AA_BASE_PERMS << AA_USER_SHIFT)
|
|
#define AA_OTHER_PERMS (AA_BASE_PERMS << AA_OTHER_SHIFT)
|
|
|
|
#define AA_FILE_PERMS (AA_USER_PERMS | AA_OTHER_PERMS )
|
|
|
|
#define AA_USER_PTRACE (1 << 28)
|
|
#define AA_OTHER_PTRACE (1 << 29)
|
|
#define AA_PTRACE_PERMS (AA_USER_PTRACE | AA_OTHER_PTRACE)
|
|
|
|
#define AA_CHANGE_HAT (1 << 30)
|
|
#define AA_CHANGE_PROFILE (1 << 31)
|
|
#define AA_SHARED_PERMS (AA_CHANGE_HAT | AA_CHANGE_PROFILE)
|
|
|
|
#define AA_EXEC_MODIFIERS (AA_EXEC_MOD_0 | AA_EXEC_MOD_1 | \
|
|
AA_EXEC_MOD_2 | AA_EXEC_MOD_3)
|
|
#define AA_EXEC_COUNT 16
|
|
|
|
#define AA_USER_EXEC_MODIFIERS (AA_EXEC_MODIFIERS << AA_USER_SHIFT)
|
|
#define AA_OTHER_EXEC_MODIFIERS (AA_EXEC_MODIFIERS << AA_OTHER_SHIFT)
|
|
#define AA_ALL_EXEC_MODIFIERS (AA_USER_EXEC_MODIFIERS | \
|
|
AA_OTHER_EXEC_MODIFIERS)
|
|
|
|
#define AA_EXEC_TYPE (AA_EXEC_UNSAFE | AA_EXEC_INHERIT | \
|
|
AA_EXEC_PUX | AA_EXEC_MODIFIERS)
|
|
|
|
#define AA_EXEC_UNCONFINED (AA_EXEC_MOD_0)
|
|
#define AA_EXEC_PROFILE (AA_EXEC_MOD_1)
|
|
#define AA_EXEC_LOCAL (AA_EXEC_MOD_0 | AA_EXEC_MOD_1)
|
|
|
|
#define AA_VALID_PERMS (AA_FILE_PERMS | AA_PTRACE_PERMS | \
|
|
AA_OTHER_PERMS)
|
|
|
|
#define AA_USER_EXEC (AA_MAY_EXEC << AA_USER_SHIFT)
|
|
#define AA_OTHER_EXEC (AA_MAY_EXEC << AA_OTHER_SHIFT)
|
|
|
|
#define AA_EXEC_BITS (AA_USER_EXEC | AA_OTHER_EXEC)
|
|
|
|
#define ALL_AA_EXEC_UNSAFE ((AA_EXEC_UNSAFE << AA_USER_SHIFT) | \
|
|
(AA_EXEC_UNSAFE << AA_OTHER_SHIFT))
|
|
|
|
#define AA_USER_EXEC_TYPE (AA_EXEC_TYPE << AA_USER_SHIFT)
|
|
#define AA_OTHER_EXEC_TYPE (AA_EXEC_TYPE << AA_OTHER_SHIFT)
|
|
|
|
#define ALL_AA_EXEC_TYPE (AA_USER_EXEC_TYPE | AA_OTHER_EXEC_TYPE)
|
|
|
|
#define AA_LINK_BITS ((AA_MAY_LINK << AA_USER_SHIFT) | \
|
|
(AA_MAY_LINK << AA_OTHER_SHIFT))
|
|
|
|
#define SHIFT_MODE(MODE, SHIFT) ((((MODE) & AA_BASE_PERMS) << (SHIFT))\
|
|
| ((MODE) & ~AA_FILE_PERMS))
|
|
#define SHIFT_TO_BASE(MODE, SHIFT) ((((MODE) & AA_FILE_PERMS) >> (SHIFT))\
|
|
| ((MODE) & ~AA_FILE_PERMS))
|
|
|
|
|
|
#define AA_LINK_SUBSET_TEST (AA_MAY_LINK << 1)
|
|
#define LINK_SUBSET_BITS ((AA_LINK_SUBSET_TEST << AA_USER_SHIFT) | \
|
|
(AA_LINK_SUBSET_TEST << AA_OTHER_SHIFT))
|
|
#define LINK_TO_LINK_SUBSET(X) (((X) << 1) & AA_LINK_SUBSET_TEST)
|
|
|
|
|
|
/* Pack the audit, and quiet masks into a single 28 bit field in the
|
|
* format oq:oa:uq:ua
|
|
*/
|
|
#define PACK_AUDIT_CTL(audit, quiet) (((audit) & 0x1fc07f) | \
|
|
(((quiet) & 0x1fc07f) << 7))
|
|
|
|
#define AA_HAT_SIZE 975 /* Maximum size of a subdomain
|
|
* ident (hat) */
|
|
#define AA_IP_TCP 0x0001
|
|
#define AA_IP_UDP 0x0002
|
|
#define AA_IP_RDP 0x0004
|
|
#define AA_IP_RAW 0x0008
|
|
#define AA_IPV6_TCP 0x0010
|
|
#define AA_IPV6_UDP 0x0020
|
|
#define AA_NETLINK 0x0040
|
|
|
|
enum pattern_t {
|
|
ePatternBasic,
|
|
ePatternTailGlob,
|
|
ePatternRegex,
|
|
ePatternInvalid,
|
|
};
|
|
|
|
#define HAS_MAY_READ(mode) ((mode) & AA_MAY_READ)
|
|
#define HAS_MAY_WRITE(mode) ((mode) & AA_MAY_WRITE)
|
|
#define HAS_MAY_APPEND(mode) ((mode) & AA_MAY_APPEND)
|
|
#define HAS_MAY_EXEC(mode) ((mode) & AA_MAY_EXEC)
|
|
#define HAS_MAY_LINK(mode) ((mode) & AA_MAY_LINK)
|
|
#define HAS_MAY_LOCK(mode) ((mode) & AA_MAY_LOCK)
|
|
#define HAS_EXEC_MMAP(mode) ((mode) & AA_EXEC_MMAP)
|
|
|
|
#define HAS_EXEC_UNSAFE(mode) ((mode) & AA_EXEC_UNSAFE)
|
|
#define HAS_CHANGE_PROFILE(mode) ((mode) & AA_CHANGE_PROFILE)
|
|
|
|
#include <stdio.h>
|
|
static inline int is_merged_x_consistent(int a, int b)
|
|
{
|
|
if ((a & AA_USER_EXEC) && (b & AA_USER_EXEC) &&
|
|
((a & AA_USER_EXEC_TYPE) != (b & AA_USER_EXEC_TYPE)))
|
|
{ fprintf(stderr, "failed user merge 0x%x 0x%x\n", a, b);
|
|
return 0;
|
|
}
|
|
if ((a & AA_OTHER_EXEC) && (b & AA_OTHER_EXEC) &&
|
|
((a & AA_OTHER_EXEC_TYPE) != (b & AA_OTHER_EXEC_TYPE)))
|
|
{ fprintf(stderr, "failed other merge 0x%x 0x%x\n", a, b);
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
#endif /* ! _IMMUNIX_H */
|