Skip to content

Commit 3e7773f

Browse files
committed
selinux: fix style issues with security/selinux/include/netlabel.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 <paul@paul-moore.com>
1 parent e04f858 commit 3e7773f

1 file changed

Lines changed: 20 additions & 33 deletions

File tree

security/selinux/include/netlabel.h

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,19 @@ void selinux_netlbl_err(struct sk_buff *skb, u16 family, int error,
3232
void selinux_netlbl_sk_security_free(struct sk_security_struct *sksec);
3333
void selinux_netlbl_sk_security_reset(struct sk_security_struct *sksec);
3434

35-
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
36-
u16 family,
37-
u32 *type,
35+
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u16 family, u32 *type,
3836
u32 *sid);
39-
int selinux_netlbl_skbuff_setsid(struct sk_buff *skb,
40-
u16 family,
41-
u32 sid);
37+
int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, u16 family, u32 sid);
4238
int selinux_netlbl_sctp_assoc_request(struct sctp_association *asoc,
43-
struct sk_buff *skb);
39+
struct sk_buff *skb);
4440
int selinux_netlbl_inet_conn_request(struct request_sock *req, u16 family);
4541
void selinux_netlbl_inet_csk_clone(struct sock *sk, u16 family);
4642
void selinux_netlbl_sctp_sk_clone(struct sock *sk, struct sock *newsk);
4743
int selinux_netlbl_socket_post_create(struct sock *sk, u16 family);
4844
int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
49-
struct sk_buff *skb,
50-
u16 family,
45+
struct sk_buff *skb, u16 family,
5146
struct common_audit_data *ad);
52-
int selinux_netlbl_socket_setsockopt(struct socket *sock,
53-
int level,
47+
int selinux_netlbl_socket_setsockopt(struct socket *sock, int level,
5448
int optname);
5549
int selinux_netlbl_socket_connect(struct sock *sk, struct sockaddr *addr);
5650
int selinux_netlbl_socket_connect_locked(struct sock *sk,
@@ -62,44 +56,40 @@ static inline void selinux_netlbl_cache_invalidate(void)
6256
return;
6357
}
6458

65-
static inline void selinux_netlbl_err(struct sk_buff *skb,
66-
u16 family,
67-
int error,
68-
int gateway)
59+
static inline void selinux_netlbl_err(struct sk_buff *skb, u16 family,
60+
int error, int gateway)
6961
{
7062
return;
7163
}
7264

73-
static inline void selinux_netlbl_sk_security_free(
74-
struct sk_security_struct *sksec)
65+
static inline void
66+
selinux_netlbl_sk_security_free(struct sk_security_struct *sksec)
7567
{
7668
return;
7769
}
7870

79-
static inline void selinux_netlbl_sk_security_reset(
80-
struct sk_security_struct *sksec)
71+
static inline void
72+
selinux_netlbl_sk_security_reset(struct sk_security_struct *sksec)
8173
{
8274
return;
8375
}
8476

85-
static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
86-
u16 family,
87-
u32 *type,
88-
u32 *sid)
77+
static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u16 family,
78+
u32 *type, u32 *sid)
8979
{
9080
*type = NETLBL_NLTYPE_NONE;
9181
*sid = SECSID_NULL;
9282
return 0;
9383
}
94-
static inline int selinux_netlbl_skbuff_setsid(struct sk_buff *skb,
95-
u16 family,
84+
static inline int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, u16 family,
9685
u32 sid)
9786
{
9887
return 0;
9988
}
10089

101-
static inline int selinux_netlbl_sctp_assoc_request(struct sctp_association *asoc,
102-
struct sk_buff *skb)
90+
static inline int
91+
selinux_netlbl_sctp_assoc_request(struct sctp_association *asoc,
92+
struct sk_buff *skb)
10393
{
10494
return 0;
10595
}
@@ -117,21 +107,18 @@ static inline void selinux_netlbl_sctp_sk_clone(struct sock *sk,
117107
{
118108
return;
119109
}
120-
static inline int selinux_netlbl_socket_post_create(struct sock *sk,
121-
u16 family)
110+
static inline int selinux_netlbl_socket_post_create(struct sock *sk, u16 family)
122111
{
123112
return 0;
124113
}
125114
static inline int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
126-
struct sk_buff *skb,
127-
u16 family,
115+
struct sk_buff *skb, u16 family,
128116
struct common_audit_data *ad)
129117
{
130118
return 0;
131119
}
132120
static inline int selinux_netlbl_socket_setsockopt(struct socket *sock,
133-
int level,
134-
int optname)
121+
int level, int optname)
135122
{
136123
return 0;
137124
}

0 commit comments

Comments
 (0)