* [PATCH 1/1] selinux: fix 2.6.20-rc6 build when no xfrm
@ 2007-01-26 16:58 ` Venkat Yekkirala
0 siblings, 0 replies; 3+ messages in thread
From: Venkat Yekkirala @ 2007-01-26 16:58 UTC (permalink / raw)
To: davem, netdev
Cc: selinux, eparis, sgrubb, sds, jmorris, chanson,
michal.k.k.piotrowski
This patch is an incremental fix to the flow_cache_genid
patch for selinux that breaks the build of 2.6.20-rc6 when
xfrm is not configured.
Signed-off-by: Venkat Yekkirala <vyekkirala@TrustedCS.com>
---
security/selinux/include/xfrm.h | 9 +++++++++
security/selinux/ss/services.c | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
index 161eb57..31929e3 100644
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
@@ -37,6 +37,11 @@ int selinux_xfrm_sock_rcv_skb(u32 sid, s
int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
struct avc_audit_data *ad, u8 proto);
int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
+
+static inline void selinux_xfrm_notify_policyload(void)
+{
+ atomic_inc(&flow_cache_genid);
+}
#else
static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
struct avc_audit_data *ad)
@@ -55,6 +60,10 @@ static inline int selinux_xfrm_decode_se
*sid = SECSID_NULL;
return 0;
}
+
+static inline void selinux_xfrm_notify_policyload(void)
+{
+}
#endif
static inline void selinux_skb_xfrm_sid(struct sk_buff *skb, u32 *sid)
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index ff03933..ca9154d 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1299,7 +1299,7 @@ int security_load_policy(void *data, siz
avc_ss_reset(seqno);
selnl_notify_policyload(seqno);
selinux_netlbl_cache_invalidate();
- atomic_inc(&flow_cache_genid);
+ selinux_xfrm_notify_policyload();
return 0;
}
@@ -1355,7 +1355,7 @@ #endif
avc_ss_reset(seqno);
selnl_notify_policyload(seqno);
selinux_netlbl_cache_invalidate();
- atomic_inc(&flow_cache_genid);
+ selinux_xfrm_notify_policyload();
return 0;
@@ -1855,7 +1855,7 @@ out:
if (!rc) {
avc_ss_reset(seqno);
selnl_notify_policyload(seqno);
- atomic_inc(&flow_cache_genid);
+ selinux_xfrm_notify_policyload();
}
return rc;
}
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/1] selinux: fix 2.6.20-rc6 build when no xfrm
@ 2007-01-26 16:58 ` Venkat Yekkirala
0 siblings, 0 replies; 3+ messages in thread
From: Venkat Yekkirala @ 2007-01-26 16:58 UTC (permalink / raw)
To: davem, netdev
Cc: selinux, eparis, sgrubb, sds, jmorris, chanson,
michal.k.k.piotrowski
This patch is an incremental fix to the flow_cache_genid
patch for selinux that breaks the build of 2.6.20-rc6 when
xfrm is not configured.
Signed-off-by: Venkat Yekkirala <vyekkirala@TrustedCS.com>
---
security/selinux/include/xfrm.h | 9 +++++++++
security/selinux/ss/services.c | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
index 161eb57..31929e3 100644
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
@@ -37,6 +37,11 @@ int selinux_xfrm_sock_rcv_skb(u32 sid, s
int selinux_xfrm_postroute_last(u32 isec_sid, struct sk_buff *skb,
struct avc_audit_data *ad, u8 proto);
int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
+
+static inline void selinux_xfrm_notify_policyload(void)
+{
+ atomic_inc(&flow_cache_genid);
+}
#else
static inline int selinux_xfrm_sock_rcv_skb(u32 isec_sid, struct sk_buff *skb,
struct avc_audit_data *ad)
@@ -55,6 +60,10 @@ static inline int selinux_xfrm_decode_se
*sid = SECSID_NULL;
return 0;
}
+
+static inline void selinux_xfrm_notify_policyload(void)
+{
+}
#endif
static inline void selinux_skb_xfrm_sid(struct sk_buff *skb, u32 *sid)
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index ff03933..ca9154d 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1299,7 +1299,7 @@ int security_load_policy(void *data, siz
avc_ss_reset(seqno);
selnl_notify_policyload(seqno);
selinux_netlbl_cache_invalidate();
- atomic_inc(&flow_cache_genid);
+ selinux_xfrm_notify_policyload();
return 0;
}
@@ -1355,7 +1355,7 @@ #endif
avc_ss_reset(seqno);
selnl_notify_policyload(seqno);
selinux_netlbl_cache_invalidate();
- atomic_inc(&flow_cache_genid);
+ selinux_xfrm_notify_policyload();
return 0;
@@ -1855,7 +1855,7 @@ out:
if (!rc) {
avc_ss_reset(seqno);
selnl_notify_policyload(seqno);
- atomic_inc(&flow_cache_genid);
+ selinux_xfrm_notify_policyload();
}
return rc;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] selinux: fix 2.6.20-rc6 build when no xfrm
2007-01-26 16:58 ` Venkat Yekkirala
(?)
@ 2007-01-27 3:04 ` David Miller
-1 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2007-01-27 3:04 UTC (permalink / raw)
To: vyekkirala
Cc: netdev, selinux, eparis, sgrubb, sds, jmorris, chanson,
michal.k.k.piotrowski
From: Venkat Yekkirala <vyekkirala@trustedcs.com>
Date: Fri, 26 Jan 2007 10:58:03 -0600
> This patch is an incremental fix to the flow_cache_genid
> patch for selinux that breaks the build of 2.6.20-rc6 when
> xfrm is not configured.
>
> Signed-off-by: Venkat Yekkirala <vyekkirala@TrustedCS.com>
Applied, thanks for taking care of this.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-01-27 3:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-26 16:58 [PATCH 1/1] selinux: fix 2.6.20-rc6 build when no xfrm Venkat Yekkirala
2007-01-26 16:58 ` Venkat Yekkirala
2007-01-27 3:04 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.