diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2023-07-06 15:23:29 +0200 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2023-07-18 18:29:49 -0400 |
| commit | 7128578c79a73760305f89ff975047c124919dfc (patch) | |
| tree | 579320630af28b9debd03cf7feee608aa4327ab2 /security/selinux | |
| parent | a13479bb3c9d559fceb075986d8e0154a7eabbb1 (diff) | |
| download | linux-stable-7128578c79a73760305f89ff975047c124919dfc.tar.gz linux-stable-7128578c79a73760305f89ff975047c124919dfc.tar.bz2 linux-stable-7128578c79a73760305f89ff975047c124919dfc.zip | |
selinux: use consistent type for AV rule specifier
The specifier for avtab keys is always supplied with a type of u16,
either as a macro to security_compute_sid() or the member specified of
the struct avtab_key.
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'security/selinux')
| -rw-r--r-- | security/selinux/ss/avtab.c | 2 | ||||
| -rw-r--r-- | security/selinux/ss/avtab.h | 2 | ||||
| -rw-r--r-- | security/selinux/ss/services.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index 7d21de48c28d..8d7c14ca27a2 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c @@ -248,7 +248,7 @@ struct avtab_node *avtab_search_node(struct avtab *h, } struct avtab_node* -avtab_search_node_next(struct avtab_node *node, int specified) +avtab_search_node_next(struct avtab_node *node, u16 specified) { struct avtab_node *cur; diff --git a/security/selinux/ss/avtab.h b/security/selinux/ss/avtab.h index d6742fd9c560..f265e9da18e2 100644 --- a/security/selinux/ss/avtab.h +++ b/security/selinux/ss/avtab.h @@ -111,7 +111,7 @@ struct avtab_node *avtab_insert_nonunique(struct avtab *h, struct avtab_node *avtab_search_node(struct avtab *h, const struct avtab_key *key); -struct avtab_node *avtab_search_node_next(struct avtab_node *node, int specified); +struct avtab_node *avtab_search_node_next(struct avtab_node *node, u16 specified); #define MAX_AVTAB_HASH_BITS 16 #define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS) diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 78946b71c1c1..83b85536cd2b 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1694,7 +1694,7 @@ static void filename_compute_type(struct policydb *policydb, static int security_compute_sid(u32 ssid, u32 tsid, u16 orig_tclass, - u32 specified, + u16 specified, const char *objname, u32 *out_sid, bool kern) |