Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34479
b: refs/heads/master
c: 9a673e5
h: refs/heads/master
i:
  34477: 1e13fa1
  34475: dbffeec
  34471: ca1f1c6
  34463: b42548c
v: v3
  • Loading branch information
Adrian Bunk authored and David S. Miller committed Sep 22, 2006
1 parent 34d4ff8 commit 3934058
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 97a4f3e7110619568aa239fe19143d9ec42dede5
refs/heads/master: 9a673e563e543a5c8a6f9824562e55e807b8a56c
12 changes: 7 additions & 5 deletions trunk/security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;

Expand All @@ -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;
}
Expand Down

0 comments on commit 3934058

Please sign in to comment.