diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 09:15:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 09:15:27 +0300 |
| commit | 14d34d2dbbe2d9144a65bae1549202d1717062e2 (patch) | |
| tree | 8d8a84be09fa898bdfdf14e7783cd6b42d6bb0ed /security/selinux/ss/sidtab.h | |
| parent | 3db53374405fbf7a474086ed984189f65b6f0008 (diff) | |
| parent | d434405aaab7d0ebc516b68a8fc4100922d7f5ef (diff) | |
| download | linux-14d34d2dbbe2d9144a65bae1549202d1717062e2.tar.xz | |
Merge 5.12-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'security/selinux/ss/sidtab.h')
| -rw-r--r-- | security/selinux/ss/sidtab.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/selinux/ss/sidtab.h b/security/selinux/ss/sidtab.h index 80c744d07ad6..4eff0e49dcb2 100644 --- a/security/selinux/ss/sidtab.h +++ b/security/selinux/ss/sidtab.h @@ -86,6 +86,7 @@ struct sidtab { u32 count; /* access only under spinlock */ struct sidtab_convert_params *convert; + bool frozen; spinlock_t lock; #if CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE > 0 @@ -125,6 +126,9 @@ int sidtab_convert(struct sidtab *s, struct sidtab_convert_params *params); void sidtab_cancel_convert(struct sidtab *s); +void sidtab_freeze_begin(struct sidtab *s, unsigned long *flags) __acquires(&s->lock); +void sidtab_freeze_end(struct sidtab *s, unsigned long *flags) __releases(&s->lock); + int sidtab_context_to_sid(struct sidtab *s, struct context *context, u32 *sid); void sidtab_destroy(struct sidtab *s); |