Merge git://git.infradead.org/users/eparis/selinux
Conflicts: security/selinux/hooks.c Pull Eric's existing SELinux tree as there are a number of patches in there that are not yet upstream. There was some minor fixup needed to resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts() between the labeled NFS patches and Eric's security_fs_use() simplification patch.
This commit is contained in:
@@ -1342,22 +1342,17 @@ int security_xfrm_policy_delete(struct xfrm_sec_ctx *ctx)
|
||||
return security_ops->xfrm_policy_delete_security(ctx);
|
||||
}
|
||||
|
||||
int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx)
|
||||
int security_xfrm_state_alloc(struct xfrm_state *x,
|
||||
struct xfrm_user_sec_ctx *sec_ctx)
|
||||
{
|
||||
return security_ops->xfrm_state_alloc_security(x, sec_ctx, 0);
|
||||
return security_ops->xfrm_state_alloc(x, sec_ctx);
|
||||
}
|
||||
EXPORT_SYMBOL(security_xfrm_state_alloc);
|
||||
|
||||
int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
|
||||
struct xfrm_sec_ctx *polsec, u32 secid)
|
||||
{
|
||||
if (!polsec)
|
||||
return 0;
|
||||
/*
|
||||
* We want the context to be taken from secid which is usually
|
||||
* from the sock.
|
||||
*/
|
||||
return security_ops->xfrm_state_alloc_security(x, NULL, secid);
|
||||
return security_ops->xfrm_state_alloc_acquire(x, polsec, secid);
|
||||
}
|
||||
|
||||
int security_xfrm_state_delete(struct xfrm_state *x)
|
||||
|
Reference in New Issue
Block a user