[SELINUX]: Fix 2.6.20-rc6 build when no xfrm
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> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
c229ec5dae
commit
342a0cff0a
@@ -1299,7 +1299,7 @@ int security_load_policy(void *data, size_t len)
|
||||
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 @@ int security_load_policy(void *data, size_t len)
|
||||
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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user