mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 14:11:52 +00:00
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>
This commit is contained in:
parent
e04f8585d0
commit
3e7773f8da
@ -32,13 +32,9 @@ void selinux_netlbl_err(struct sk_buff *skb, u16 family, int error,
|
||||
void selinux_netlbl_sk_security_free(struct sk_security_struct *sksec);
|
||||
void selinux_netlbl_sk_security_reset(struct sk_security_struct *sksec);
|
||||
|
||||
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
|
||||
u16 family,
|
||||
u32 *type,
|
||||
int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u16 family, u32 *type,
|
||||
u32 *sid);
|
||||
int selinux_netlbl_skbuff_setsid(struct sk_buff *skb,
|
||||
u16 family,
|
||||
u32 sid);
|
||||
int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, u16 family, u32 sid);
|
||||
int selinux_netlbl_sctp_assoc_request(struct sctp_association *asoc,
|
||||
struct sk_buff *skb);
|
||||
int selinux_netlbl_inet_conn_request(struct request_sock *req, u16 family);
|
||||
@ -46,11 +42,9 @@ void selinux_netlbl_inet_csk_clone(struct sock *sk, u16 family);
|
||||
void selinux_netlbl_sctp_sk_clone(struct sock *sk, struct sock *newsk);
|
||||
int selinux_netlbl_socket_post_create(struct sock *sk, u16 family);
|
||||
int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
||||
struct sk_buff *skb,
|
||||
u16 family,
|
||||
struct sk_buff *skb, u16 family,
|
||||
struct common_audit_data *ad);
|
||||
int selinux_netlbl_socket_setsockopt(struct socket *sock,
|
||||
int level,
|
||||
int selinux_netlbl_socket_setsockopt(struct socket *sock, int level,
|
||||
int optname);
|
||||
int selinux_netlbl_socket_connect(struct sock *sk, struct sockaddr *addr);
|
||||
int selinux_netlbl_socket_connect_locked(struct sock *sk,
|
||||
@ -62,43 +56,39 @@ static inline void selinux_netlbl_cache_invalidate(void)
|
||||
return;
|
||||
}
|
||||
|
||||
static inline void selinux_netlbl_err(struct sk_buff *skb,
|
||||
u16 family,
|
||||
int error,
|
||||
int gateway)
|
||||
static inline void selinux_netlbl_err(struct sk_buff *skb, u16 family,
|
||||
int error, int gateway)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
static inline void selinux_netlbl_sk_security_free(
|
||||
struct sk_security_struct *sksec)
|
||||
static inline void
|
||||
selinux_netlbl_sk_security_free(struct sk_security_struct *sksec)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
static inline void selinux_netlbl_sk_security_reset(
|
||||
struct sk_security_struct *sksec)
|
||||
static inline void
|
||||
selinux_netlbl_sk_security_reset(struct sk_security_struct *sksec)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb,
|
||||
u16 family,
|
||||
u32 *type,
|
||||
u32 *sid)
|
||||
static inline int selinux_netlbl_skbuff_getsid(struct sk_buff *skb, u16 family,
|
||||
u32 *type, u32 *sid)
|
||||
{
|
||||
*type = NETLBL_NLTYPE_NONE;
|
||||
*sid = SECSID_NULL;
|
||||
return 0;
|
||||
}
|
||||
static inline int selinux_netlbl_skbuff_setsid(struct sk_buff *skb,
|
||||
u16 family,
|
||||
static inline int selinux_netlbl_skbuff_setsid(struct sk_buff *skb, u16 family,
|
||||
u32 sid)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int selinux_netlbl_sctp_assoc_request(struct sctp_association *asoc,
|
||||
static inline int
|
||||
selinux_netlbl_sctp_assoc_request(struct sctp_association *asoc,
|
||||
struct sk_buff *skb)
|
||||
{
|
||||
return 0;
|
||||
@ -117,21 +107,18 @@ static inline void selinux_netlbl_sctp_sk_clone(struct sock *sk,
|
||||
{
|
||||
return;
|
||||
}
|
||||
static inline int selinux_netlbl_socket_post_create(struct sock *sk,
|
||||
u16 family)
|
||||
static inline int selinux_netlbl_socket_post_create(struct sock *sk, u16 family)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline int selinux_netlbl_sock_rcv_skb(struct sk_security_struct *sksec,
|
||||
struct sk_buff *skb,
|
||||
u16 family,
|
||||
struct sk_buff *skb, u16 family,
|
||||
struct common_audit_data *ad)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
static inline int selinux_netlbl_socket_setsockopt(struct socket *sock,
|
||||
int level,
|
||||
int optname)
|
||||
int level, int optname)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user