[GIT] SELinux/IPsec: bugfix pull request

[GIT] SELinux/IPsec: bugfix pull request

[James Morris]

Hi Dave, please pull the following bugfix patches, for the IPsec/SELinux 
and related labeled network code.


The following changes since commit e77119c769b71c3f10b35d66988a3e279d30388c:
  James Morris:
        Merge ../../linux-2.6 into linus

are found in the git repository at:

  git://git.infradead.org/~jmorris/selinux-2.6.git

James Morris:
      IPsec: propagate security module errors up from flow_cache_lookup

paul.moore@hp.com:
      NetLabel: use SECINITSID_UNLABELED for a base SID

Venkat Yekkirala:
      IPsec: correct semantics for SELinux policy matching
      IPsec: fix handling of errors for socket policies

 include/linux/security.h        |   24 +++------
 include/net/flow.h              |    2 -
 include/net/xfrm.h              |    3 +
 net/core/flow.c                 |   42 +++++++++++-----
 net/ipv4/xfrm4_policy.c         |    2 -
 net/ipv6/xfrm6_policy.c         |    2 -
 net/key/af_key.c                |    5 --
 net/xfrm/xfrm_policy.c          |  101 +++++++++++++++++++++++++++++----------
 net/xfrm/xfrm_user.c            |    9 ---
 security/dummy.c                |    3 +
 security/selinux/include/xfrm.h |    3 +
 security/selinux/ss/services.c  |   29 +++--------
 security/selinux/xfrm.c         |   53 ++++++++++++++++----
 13 files changed, 171 insertions(+), 107 deletions(-)

-- 
James Morris
<jmorris@namei.org>