forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
selinux: fix style issues in security/selinux/ss/mls.h
As part of on ongoing effort to perform more automated testing and provide more tools for individual developers to validate their patches before submitting, we are trying to make our code "clang-format clean". My hope is that once we have fixed all of our style "quirks", developers will be able to run clang-format on their patches to help avoid silly formatting problems and ensure their changes fit in well with the rest of the SELinux kernel code. Signed-off-by: Paul Moore <[email protected]>
- Loading branch information
Showing
1 changed file
with
19 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,19 +4,15 @@ | |
* | ||
* Author : Stephen Smalley, <[email protected]> | ||
*/ | ||
|
||
/* | ||
* Updated: Trusted Computer Solutions, Inc. <[email protected]> | ||
* Support for enhanced MLS infrastructure. | ||
* Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. | ||
* | ||
* Support for enhanced MLS infrastructure. | ||
* | ||
* Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. | ||
*/ | ||
/* | ||
* Updated: Hewlett-Packard <[email protected]> | ||
* | ||
* Added support to import/export the MLS label from NetLabel | ||
* | ||
* (c) Copyright Hewlett-Packard Development Company, L.P., 2006 | ||
* Added support to import/export the MLS label from NetLabel | ||
* Copyright (X) Hewlett-Packard Development Company, L.P., 2006 | ||
*/ | ||
|
||
#ifndef _SS_MLS_H_ | ||
|
@@ -35,47 +31,32 @@ int mls_context_isvalid(struct policydb *p, struct context *c); | |
int mls_range_isvalid(struct policydb *p, struct mls_range *r); | ||
int mls_level_isvalid(struct policydb *p, struct mls_level *l); | ||
|
||
int mls_context_to_sid(struct policydb *p, | ||
char oldc, | ||
char *scontext, | ||
struct context *context, | ||
struct sidtab *s, | ||
u32 def_sid); | ||
int mls_context_to_sid(struct policydb *p, char oldc, char *scontext, | ||
struct context *context, struct sidtab *s, u32 def_sid); | ||
|
||
int mls_from_string(struct policydb *p, char *str, struct context *context, | ||
gfp_t gfp_mask); | ||
|
||
int mls_range_set(struct context *context, struct mls_range *range); | ||
|
||
int mls_convert_context(struct policydb *oldp, | ||
struct policydb *newp, | ||
struct context *oldc, | ||
struct context *newc); | ||
int mls_convert_context(struct policydb *oldp, struct policydb *newp, | ||
struct context *oldc, struct context *newc); | ||
|
||
int mls_compute_sid(struct policydb *p, | ||
struct context *scontext, | ||
struct context *tcontext, | ||
u16 tclass, | ||
u32 specified, | ||
struct context *newcontext, | ||
bool sock); | ||
int mls_compute_sid(struct policydb *p, struct context *scontext, | ||
struct context *tcontext, u16 tclass, u32 specified, | ||
struct context *newcontext, bool sock); | ||
|
||
int mls_setup_user_range(struct policydb *p, | ||
struct context *fromcon, struct user_datum *user, | ||
struct context *usercon); | ||
int mls_setup_user_range(struct policydb *p, struct context *fromcon, | ||
struct user_datum *user, struct context *usercon); | ||
|
||
#ifdef CONFIG_NETLABEL | ||
void mls_export_netlbl_lvl(struct policydb *p, | ||
struct context *context, | ||
void mls_export_netlbl_lvl(struct policydb *p, struct context *context, | ||
struct netlbl_lsm_secattr *secattr); | ||
void mls_import_netlbl_lvl(struct policydb *p, | ||
struct context *context, | ||
void mls_import_netlbl_lvl(struct policydb *p, struct context *context, | ||
struct netlbl_lsm_secattr *secattr); | ||
int mls_export_netlbl_cat(struct policydb *p, | ||
struct context *context, | ||
int mls_export_netlbl_cat(struct policydb *p, struct context *context, | ||
struct netlbl_lsm_secattr *secattr); | ||
int mls_import_netlbl_cat(struct policydb *p, | ||
struct context *context, | ||
int mls_import_netlbl_cat(struct policydb *p, struct context *context, | ||
struct netlbl_lsm_secattr *secattr); | ||
#else | ||
static inline void mls_export_netlbl_lvl(struct policydb *p, | ||
|
@@ -112,5 +93,4 @@ static inline u32 mls_range_hash(const struct mls_range *r, u32 hash) | |
return hash; | ||
} | ||
|
||
#endif /* _SS_MLS_H */ | ||
|
||
#endif /* _SS_MLS_H */ |