From 3934058c590839a7937942f0b2f78240a2f42737 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 15 Aug 2006 00:03:53 -0700 Subject: [PATCH] --- yaml --- r: 34479 b: refs/heads/master c: 9a673e563e543a5c8a6f9824562e55e807b8a56c h: refs/heads/master i: 34477: 1e13fa1fbc35edb1d0a4f8da1209aa3f261693a8 34475: dbffeecf25c7dedfe7180aeb1bc1d1da62a69a41 34471: ca1f1c667a9d0fbe41a584e8cc042c2673b9744f 34463: b42548c1dcbef057ac81d747fe7cd13490caeeff v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fa8c701becc0..405a26f9ca8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97a4f3e7110619568aa239fe19143d9ec42dede5 +refs/heads/master: 9a673e563e543a5c8a6f9824562e55e807b8a56c diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c index 2a6bbb921e1e..180b26b97d2d 100644 --- a/trunk/security/selinux/hooks.c +++ b/trunk/security/selinux/hooks.c @@ -3598,7 +3598,7 @@ static void selinux_sk_getsecid(struct sock *sk, u32 *secid) } } -void selinux_sock_graft(struct sock* sk, struct socket *parent) +static void selinux_sock_graft(struct sock* sk, struct socket *parent) { struct inode_security_struct *isec = SOCK_INODE(parent)->i_security; struct sk_security_struct *sksec = sk->sk_security; @@ -3608,8 +3608,8 @@ void selinux_sock_graft(struct sock* sk, struct socket *parent) selinux_netlbl_sock_graft(sk, parent); } -int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb, - struct request_sock *req) +static int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb, + struct request_sock *req) { struct sk_security_struct *sksec = sk->sk_security; int err; @@ -3638,7 +3638,8 @@ int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb, return 0; } -void selinux_inet_csk_clone(struct sock *newsk, const struct request_sock *req) +static void selinux_inet_csk_clone(struct sock *newsk, + const struct request_sock *req) { struct sk_security_struct *newsksec = newsk->sk_security; @@ -3649,7 +3650,8 @@ void selinux_inet_csk_clone(struct sock *newsk, const struct request_sock *req) time it will have been created and available. */ } -void selinux_req_classify_flow(const struct request_sock *req, struct flowi *fl) +static void selinux_req_classify_flow(const struct request_sock *req, + struct flowi *fl) { fl->secid = req->secid; }