Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
		
			
				
	
	
		
			93 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			93 lines
		
	
	
	
		
			2.4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * SELinux support for the XFRM LSM hooks
 | 
						|
 *
 | 
						|
 * Author : Trent Jaeger, <jaegert@us.ibm.com>
 | 
						|
 * Updated : Venkat Yekkirala, <vyekkirala@TrustedCS.com>
 | 
						|
 */
 | 
						|
#ifndef _SELINUX_XFRM_H_
 | 
						|
#define _SELINUX_XFRM_H_
 | 
						|
 | 
						|
#include <net/flow.h>
 | 
						|
 | 
						|
int selinux_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp,
 | 
						|
			      struct xfrm_user_sec_ctx *uctx,
 | 
						|
			      gfp_t gfp);
 | 
						|
int selinux_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx,
 | 
						|
			      struct xfrm_sec_ctx **new_ctxp);
 | 
						|
void selinux_xfrm_policy_free(struct xfrm_sec_ctx *ctx);
 | 
						|
int selinux_xfrm_policy_delete(struct xfrm_sec_ctx *ctx);
 | 
						|
int selinux_xfrm_state_alloc(struct xfrm_state *x,
 | 
						|
			     struct xfrm_user_sec_ctx *uctx);
 | 
						|
int selinux_xfrm_state_alloc_acquire(struct xfrm_state *x,
 | 
						|
				     struct xfrm_sec_ctx *polsec, u32 secid);
 | 
						|
void selinux_xfrm_state_free(struct xfrm_state *x);
 | 
						|
int selinux_xfrm_state_delete(struct xfrm_state *x);
 | 
						|
int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);
 | 
						|
int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x,
 | 
						|
				      struct xfrm_policy *xp,
 | 
						|
				      const struct flowi *fl);
 | 
						|
 | 
						|
#ifdef CONFIG_SECURITY_NETWORK_XFRM
 | 
						|
extern atomic_t selinux_xfrm_refcount;
 | 
						|
 | 
						|
static inline int selinux_xfrm_enabled(void)
 | 
						|
{
 | 
						|
	return (atomic_read(&selinux_xfrm_refcount) > 0);
 | 
						|
}
 | 
						|
 | 
						|
int selinux_xfrm_sock_rcv_skb(u32 sk_sid, struct sk_buff *skb,
 | 
						|
			      struct common_audit_data *ad);
 | 
						|
int selinux_xfrm_postroute_last(u32 sk_sid, struct sk_buff *skb,
 | 
						|
				struct common_audit_data *ad, u8 proto);
 | 
						|
int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
 | 
						|
int selinux_xfrm_skb_sid(struct sk_buff *skb, u32 *sid);
 | 
						|
 | 
						|
static inline void selinux_xfrm_notify_policyload(void)
 | 
						|
{
 | 
						|
	struct net *net;
 | 
						|
 | 
						|
	rtnl_lock();
 | 
						|
	for_each_net(net) {
 | 
						|
		atomic_inc(&net->xfrm.flow_cache_genid);
 | 
						|
		rt_genid_bump_all(net);
 | 
						|
	}
 | 
						|
	rtnl_unlock();
 | 
						|
}
 | 
						|
#else
 | 
						|
static inline int selinux_xfrm_enabled(void)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static inline int selinux_xfrm_sock_rcv_skb(u32 sk_sid, struct sk_buff *skb,
 | 
						|
					    struct common_audit_data *ad)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static inline int selinux_xfrm_postroute_last(u32 sk_sid, struct sk_buff *skb,
 | 
						|
					      struct common_audit_data *ad,
 | 
						|
					      u8 proto)
 | 
						|
{
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static inline int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid,
 | 
						|
					      int ckall)
 | 
						|
{
 | 
						|
	*sid = SECSID_NULL;
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static inline void selinux_xfrm_notify_policyload(void)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
static inline int selinux_xfrm_skb_sid(struct sk_buff *skb, u32 *sid)
 | 
						|
{
 | 
						|
	*sid = SECSID_NULL;
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
#endif /* _SELINUX_XFRM_H_ */
 |