Skip to content

Commit 9090308

Browse files
cgzonespcmoore
authored andcommitted
selinux: constify and reconcile function parameter names
Align the parameter names between declarations and definitions, and constify read-only parameters. Signed-off-by: Christian Göttsche <cgzones@googlemail.com> [PM: tweak the subject line] Signed-off-by: Paul Moore <paul@paul-moore.com>
1 parent 046b85a commit 9090308

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

security/selinux/include/conditional.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
int security_get_bools(struct selinux_policy *policy, u32 *len, char ***names,
1717
int **values);
1818

19-
int security_set_bools(u32 len, int *values);
19+
int security_set_bools(u32 len, const int *values);
2020

2121
int security_get_bool_value(u32 index);
2222

security/selinux/include/security.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ int security_context_to_sid_default(const char *scontext, u32 scontext_len,
290290
int security_context_to_sid_force(const char *scontext, u32 scontext_len,
291291
u32 *sid);
292292

293-
int security_get_user_sids(u32 callsid, char *username, u32 **sids, u32 *nel);
293+
int security_get_user_sids(u32 fromsid, const char *username, u32 **sids, u32 *nel);
294294

295295
int security_port_sid(u8 protocol, u16 port, u32 *out_sid);
296296

@@ -308,7 +308,7 @@ int security_validate_transition(u32 oldsid, u32 newsid, u32 tasksid,
308308
int security_validate_transition_user(u32 oldsid, u32 newsid, u32 tasksid,
309309
u16 tclass);
310310

311-
int security_bounded_transition(u32 oldsid, u32 newsid);
311+
int security_bounded_transition(u32 old_sid, u32 new_sid);
312312

313313
int security_sid_mls_copy(u32 sid, u32 mls_sid, u32 *new_sid);
314314

security/selinux/ss/avtab.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ struct avtab {
8989
};
9090

9191
void avtab_init(struct avtab *h);
92-
int avtab_alloc(struct avtab *, u32);
92+
int avtab_alloc(struct avtab *h, u32 nrules);
9393
int avtab_alloc_dup(struct avtab *new, const struct avtab *orig);
9494
void avtab_destroy(struct avtab *h);
9595

security/selinux/ss/services.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2712,7 +2712,7 @@ int security_node_sid(u16 domain,
27122712
*/
27132713

27142714
int security_get_user_sids(u32 fromsid,
2715-
char *username,
2715+
const char *username,
27162716
u32 **sids,
27172717
u32 *nel)
27182718
{
@@ -3034,7 +3034,7 @@ int security_get_bools(struct selinux_policy *policy,
30343034
}
30353035

30363036

3037-
int security_set_bools(u32 len, int *values)
3037+
int security_set_bools(u32 len, const int *values)
30383038
{
30393039
struct selinux_state *state = &selinux_state;
30403040
struct selinux_policy *newpolicy, *oldpolicy;

0 commit comments

Comments
 (0)