mirror of
https://github.com/torvalds/linux.git
synced 2024-12-02 17:11:33 +00:00
d8f5f0ea5b
Currently, duplicate_policydb_cond_list() first copies the whole
conditional avtab and then tries to link to the correct entries in
cond_dup_av_list() using avtab_search(). However, since the conditional
avtab may contain multiple entries with the same key, this approach
often fails to find the right entry, potentially leading to wrong rules
being activated/deactivated when booleans are changed.
To fix this, instead start with an empty conditional avtab and add the
individual entries one-by-one while building the new av_lists. This
approach leads to the correct result, since each entry is present in the
av_lists exactly once.
The issue can be reproduced with Fedora policy as follows:
# sesearch -s ftpd_t -t public_content_rw_t -c dir -p create -A
allow ftpd_t non_security_file_type:dir { add_name create getattr ioctl link lock open read remove_name rename reparent rmdir search setattr unlink watch watch_reads write }; [ ftpd_full_access ]:True
allow ftpd_t public_content_rw_t:dir { add_name create link remove_name rename reparent rmdir setattr unlink watch watch_reads write }; [ ftpd_anon_write ]:True
# setsebool ftpd_anon_write=off ftpd_connect_all_unreserved=off ftpd_connect_db=off ftpd_full_access=off
On fixed kernels, the sesearch output is the same after the setsebool
command:
# sesearch -s ftpd_t -t public_content_rw_t -c dir -p create -A
allow ftpd_t non_security_file_type:dir { add_name create getattr ioctl link lock open read remove_name rename reparent rmdir search setattr unlink watch watch_reads write }; [ ftpd_full_access ]:True
allow ftpd_t public_content_rw_t:dir { add_name create link remove_name rename reparent rmdir setattr unlink watch watch_reads write }; [ ftpd_anon_write ]:True
While on the broken kernels, it will be different:
# sesearch -s ftpd_t -t public_content_rw_t -c dir -p create -A
allow ftpd_t non_security_file_type:dir { add_name create getattr ioctl link lock open read remove_name rename reparent rmdir search setattr unlink watch watch_reads write }; [ ftpd_full_access ]:True
allow ftpd_t non_security_file_type:dir { add_name create getattr ioctl link lock open read remove_name rename reparent rmdir search setattr unlink watch watch_reads write }; [ ftpd_full_access ]:True
allow ftpd_t non_security_file_type:dir { add_name create getattr ioctl link lock open read remove_name rename reparent rmdir search setattr unlink watch watch_reads write }; [ ftpd_full_access ]:True
While there, also simplify the computation of nslots. This changes the
nslots values for nrules 2 or 3 to just two slots instead of 4, which
makes the sequence more consistent.
Cc: stable@vger.kernel.org
Fixes: c7c556f1e8 ("selinux: refactor changing booleans")
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
119 lines
3.7 KiB
C
119 lines
3.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* An access vector table (avtab) is a hash table
|
|
* of access vectors and transition types indexed
|
|
* by a type pair and a class. An access vector
|
|
* table is used to represent the type enforcement
|
|
* tables.
|
|
*
|
|
* Author : Stephen Smalley, <sds@tycho.nsa.gov>
|
|
*/
|
|
|
|
/* Updated: Frank Mayer <mayerf@tresys.com> and Karl MacMillan <kmacmillan@tresys.com>
|
|
*
|
|
* Added conditional policy language extensions
|
|
*
|
|
* Copyright (C) 2003 Tresys Technology, LLC
|
|
*
|
|
* Updated: Yuichi Nakamura <ynakam@hitachisoft.jp>
|
|
* Tuned number of hash slots for avtab to reduce memory usage
|
|
*/
|
|
#ifndef _SS_AVTAB_H_
|
|
#define _SS_AVTAB_H_
|
|
|
|
#include "security.h"
|
|
|
|
struct avtab_key {
|
|
u16 source_type; /* source type */
|
|
u16 target_type; /* target type */
|
|
u16 target_class; /* target object class */
|
|
#define AVTAB_ALLOWED 0x0001
|
|
#define AVTAB_AUDITALLOW 0x0002
|
|
#define AVTAB_AUDITDENY 0x0004
|
|
#define AVTAB_AV (AVTAB_ALLOWED | AVTAB_AUDITALLOW | AVTAB_AUDITDENY)
|
|
#define AVTAB_TRANSITION 0x0010
|
|
#define AVTAB_MEMBER 0x0020
|
|
#define AVTAB_CHANGE 0x0040
|
|
#define AVTAB_TYPE (AVTAB_TRANSITION | AVTAB_MEMBER | AVTAB_CHANGE)
|
|
/* extended permissions */
|
|
#define AVTAB_XPERMS_ALLOWED 0x0100
|
|
#define AVTAB_XPERMS_AUDITALLOW 0x0200
|
|
#define AVTAB_XPERMS_DONTAUDIT 0x0400
|
|
#define AVTAB_XPERMS (AVTAB_XPERMS_ALLOWED | \
|
|
AVTAB_XPERMS_AUDITALLOW | \
|
|
AVTAB_XPERMS_DONTAUDIT)
|
|
#define AVTAB_ENABLED_OLD 0x80000000 /* reserved for used in cond_avtab */
|
|
#define AVTAB_ENABLED 0x8000 /* reserved for used in cond_avtab */
|
|
u16 specified; /* what field is specified */
|
|
};
|
|
|
|
/*
|
|
* For operations that require more than the 32 permissions provided by the avc
|
|
* extended permissions may be used to provide 256 bits of permissions.
|
|
*/
|
|
struct avtab_extended_perms {
|
|
/* These are not flags. All 256 values may be used */
|
|
#define AVTAB_XPERMS_IOCTLFUNCTION 0x01
|
|
#define AVTAB_XPERMS_IOCTLDRIVER 0x02
|
|
/* extension of the avtab_key specified */
|
|
u8 specified; /* ioctl, netfilter, ... */
|
|
/*
|
|
* if 256 bits is not adequate as is often the case with ioctls, then
|
|
* multiple extended perms may be used and the driver field
|
|
* specifies which permissions are included.
|
|
*/
|
|
u8 driver;
|
|
/* 256 bits of permissions */
|
|
struct extended_perms_data perms;
|
|
};
|
|
|
|
struct avtab_datum {
|
|
union {
|
|
u32 data; /* access vector or type value */
|
|
struct avtab_extended_perms *xperms;
|
|
} u;
|
|
};
|
|
|
|
struct avtab_node {
|
|
struct avtab_key key;
|
|
struct avtab_datum datum;
|
|
struct avtab_node *next;
|
|
};
|
|
|
|
struct avtab {
|
|
struct avtab_node **htable;
|
|
u32 nel; /* number of elements */
|
|
u32 nslot; /* number of hash slots */
|
|
u32 mask; /* mask to compute hash func */
|
|
};
|
|
|
|
void avtab_init(struct avtab *h);
|
|
int avtab_alloc(struct avtab *, u32);
|
|
int avtab_alloc_dup(struct avtab *new, const struct avtab *orig);
|
|
struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *k);
|
|
void avtab_destroy(struct avtab *h);
|
|
void avtab_hash_eval(struct avtab *h, char *tag);
|
|
|
|
struct policydb;
|
|
int avtab_read_item(struct avtab *a, void *fp, struct policydb *pol,
|
|
int (*insert)(struct avtab *a, struct avtab_key *k,
|
|
struct avtab_datum *d, void *p),
|
|
void *p);
|
|
|
|
int avtab_read(struct avtab *a, void *fp, struct policydb *pol);
|
|
int avtab_write_item(struct policydb *p, struct avtab_node *cur, void *fp);
|
|
int avtab_write(struct policydb *p, struct avtab *a, void *fp);
|
|
|
|
struct avtab_node *avtab_insert_nonunique(struct avtab *h, struct avtab_key *key,
|
|
struct avtab_datum *datum);
|
|
|
|
struct avtab_node *avtab_search_node(struct avtab *h, struct avtab_key *key);
|
|
|
|
struct avtab_node *avtab_search_node_next(struct avtab_node *node, int specified);
|
|
|
|
#define MAX_AVTAB_HASH_BITS 16
|
|
#define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS)
|
|
|
|
#endif /* _SS_AVTAB_H_ */
|
|
|