projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...
[firefly-linux-kernel-4.4.55.git]
/
security
/
selinux
/
hooks.c
diff --git
a/security/selinux/hooks.c
b/security/selinux/hooks.c
index 3053992250109bc7fcf7a3e7fc9d161fdc7dea6b..9e591e5989bef8db6369d2afb4354b0a1e96efa4 100644
(file)
--- a/
security/selinux/hooks.c
+++ b/
security/selinux/hooks.c
@@
-4864,7
+4864,7
@@
static unsigned int selinux_ip_forward(struct sk_buff *skb,
return NF_ACCEPT;
}
return NF_ACCEPT;
}
-static unsigned int selinux_ipv4_forward(
const struct nf_hook_ops *ops
,
+static unsigned int selinux_ipv4_forward(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
@@
-4872,7
+4872,7
@@
static unsigned int selinux_ipv4_forward(const struct nf_hook_ops *ops,
}
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
}
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-static unsigned int selinux_ipv6_forward(
const struct nf_hook_ops *ops
,
+static unsigned int selinux_ipv6_forward(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
@@
-4896,7
+4896,7
@@
static unsigned int selinux_ip_output(struct sk_buff *skb,
if (sk) {
struct sk_security_struct *sksec;
if (sk) {
struct sk_security_struct *sksec;
- if (sk
->sk_state == TCP_LISTEN
)
+ if (sk
_listener(sk)
)
/* if the socket is the listening state then this
* packet is a SYN-ACK packet which means it needs to
* be labeled based on the connection/request_sock and
/* if the socket is the listening state then this
* packet is a SYN-ACK packet which means it needs to
* be labeled based on the connection/request_sock and
@@
-4922,7
+4922,7
@@
static unsigned int selinux_ip_output(struct sk_buff *skb,
return NF_ACCEPT;
}
return NF_ACCEPT;
}
-static unsigned int selinux_ipv4_output(
const struct nf_hook_ops *ops
,
+static unsigned int selinux_ipv4_output(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
@@
-5003,7
+5003,7
@@
static unsigned int selinux_ip_postroute(struct sk_buff *skb,
* unfortunately, this means more work, but it is only once per
* connection. */
if (skb_dst(skb) != NULL && skb_dst(skb)->xfrm != NULL &&
* unfortunately, this means more work, but it is only once per
* connection. */
if (skb_dst(skb) != NULL && skb_dst(skb)->xfrm != NULL &&
- !(sk
!= NULL && sk->sk_state == TCP_LISTEN
))
+ !(sk
&& sk_listener(sk)
))
return NF_ACCEPT;
#endif
return NF_ACCEPT;
#endif
@@
-5020,7
+5020,7
@@
static unsigned int selinux_ip_postroute(struct sk_buff *skb,
secmark_perm = PACKET__SEND;
peer_sid = SECINITSID_KERNEL;
}
secmark_perm = PACKET__SEND;
peer_sid = SECINITSID_KERNEL;
}
- } else if (sk
->sk_state == TCP_LISTEN
) {
+ } else if (sk
_listener(sk)
) {
/* Locally generated packet but the associated socket is in the
* listening state which means this is a SYN-ACK packet. In
* this particular case the correct security label is assigned
/* Locally generated packet but the associated socket is in the
* listening state which means this is a SYN-ACK packet. In
* this particular case the correct security label is assigned
@@
-5031,7
+5031,11
@@
static unsigned int selinux_ip_postroute(struct sk_buff *skb,
* selinux_inet_conn_request(). See also selinux_ip_output()
* for similar problems. */
u32 skb_sid;
* selinux_inet_conn_request(). See also selinux_ip_output()
* for similar problems. */
u32 skb_sid;
- struct sk_security_struct *sksec = sk->sk_security;
+ struct sk_security_struct *sksec;
+
+ if (sk->sk_state == TCP_NEW_SYN_RECV)
+ sk = inet_reqsk(sk)->rsk_listener;
+ sksec = sk->sk_security;
if (selinux_skb_peerlbl_sid(skb, family, &skb_sid))
return NF_DROP;
/* At this point, if the returned skb peerlbl is SECSID_NULL
if (selinux_skb_peerlbl_sid(skb, family, &skb_sid))
return NF_DROP;
/* At this point, if the returned skb peerlbl is SECSID_NULL
@@
-5097,7
+5101,7
@@
static unsigned int selinux_ip_postroute(struct sk_buff *skb,
return NF_ACCEPT;
}
return NF_ACCEPT;
}
-static unsigned int selinux_ipv4_postroute(
const struct nf_hook_ops *ops
,
+static unsigned int selinux_ipv4_postroute(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
@@
-5105,7
+5109,7
@@
static unsigned int selinux_ipv4_postroute(const struct nf_hook_ops *ops,
}
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
}
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-static unsigned int selinux_ipv6_postroute(
const struct nf_hook_ops *ops
,
+static unsigned int selinux_ipv6_postroute(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
@@
-6128,21
+6132,18
@@
security_initcall(selinux_init);
static struct nf_hook_ops selinux_nf_ops[] = {
{
.hook = selinux_ipv4_postroute,
static struct nf_hook_ops selinux_nf_ops[] = {
{
.hook = selinux_ipv4_postroute,
- .owner = THIS_MODULE,
.pf = NFPROTO_IPV4,
.hooknum = NF_INET_POST_ROUTING,
.priority = NF_IP_PRI_SELINUX_LAST,
},
{
.hook = selinux_ipv4_forward,
.pf = NFPROTO_IPV4,
.hooknum = NF_INET_POST_ROUTING,
.priority = NF_IP_PRI_SELINUX_LAST,
},
{
.hook = selinux_ipv4_forward,
- .owner = THIS_MODULE,
.pf = NFPROTO_IPV4,
.hooknum = NF_INET_FORWARD,
.priority = NF_IP_PRI_SELINUX_FIRST,
},
{
.hook = selinux_ipv4_output,
.pf = NFPROTO_IPV4,
.hooknum = NF_INET_FORWARD,
.priority = NF_IP_PRI_SELINUX_FIRST,
},
{
.hook = selinux_ipv4_output,
- .owner = THIS_MODULE,
.pf = NFPROTO_IPV4,
.hooknum = NF_INET_LOCAL_OUT,
.priority = NF_IP_PRI_SELINUX_FIRST,
.pf = NFPROTO_IPV4,
.hooknum = NF_INET_LOCAL_OUT,
.priority = NF_IP_PRI_SELINUX_FIRST,
@@
-6150,14
+6151,12
@@
static struct nf_hook_ops selinux_nf_ops[] = {
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
{
.hook = selinux_ipv6_postroute,
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
{
.hook = selinux_ipv6_postroute,
- .owner = THIS_MODULE,
.pf = NFPROTO_IPV6,
.hooknum = NF_INET_POST_ROUTING,
.priority = NF_IP6_PRI_SELINUX_LAST,
},
{
.hook = selinux_ipv6_forward,
.pf = NFPROTO_IPV6,
.hooknum = NF_INET_POST_ROUTING,
.priority = NF_IP6_PRI_SELINUX_LAST,
},
{
.hook = selinux_ipv6_forward,
- .owner = THIS_MODULE,
.pf = NFPROTO_IPV6,
.hooknum = NF_INET_FORWARD,
.priority = NF_IP6_PRI_SELINUX_FIRST,
.pf = NFPROTO_IPV6,
.hooknum = NF_INET_FORWARD,
.priority = NF_IP6_PRI_SELINUX_FIRST,