Skip to content

Labeled networking patches for 2.6.30

Paul Moore netdev selinux 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 8 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6lsm: Relocate the IPv4 security_inet_conn_request() hooksnet/ipv4/syncookies.c net/ipv4/tcp_ipv4.c+9 -70 replies
2/6netlabel: Label incoming TCP connections correctly in SELinuxinclude/net/cipso_ipv4.h include/net/netlabel.h net/ipv4/cipso_ipv4.c +5 more+360 -2201 reply
3/6selinux: Remove the "compat_net" compatibility codeDocumentation/feature-removal-schedule.txt Documentation/kernel-parameters.txt security/selinux/hooks.c +1 more+7 -2340 replies
4/6lsm: Remove the socket_post_accept() hookinclude/linux/security.h net/socket.c security/capability.c +1 more+0 -250 replies
5/6netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connectionsinclude/net/netlabel.h net/netlabel/netlabel_kapi.c security/smack/smack.h +1 more+161 -1181 reply
6/6smack: Add a new '-CIPSO' option to the network address label configurationDocumentation/Smack.txt security/smack/smack.h security/smack/smack_access.c +2 more+82 -151 reply

Reviews trailers per patch

4 of 6 patches have a Reviewed-by or Acked-by.

PatchDavid S. MillerCasey Schaufler
1/6A-b
2/6A-b
3/6
4/6
5/6A-b
6/6A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/6] Labeled networking patches for 2.6.30

This patchset wraps up all the new labeled networking bits for 2.6.30. This is mostly a fixup/cleanup release with the main focus being to correct the TCP labeling of both SELinux and Smack; expect some of this to get backported to the -stable trees but there will need to be a bit of rework first so it may take a few weeks for that to happen. Other than the TCP issue there is a new Smack feature to configure CIPSO aware hosts in "/smack/netlabel" which should make the host/network label configuration much more flexible. The last change is to get rid of the security_socket_post_accept() hook which isn't currently being used by anything in-tree and seems to act as a magnet for bad ideas; if things change we can always add it back later.

The two Smack related patches, "Add a new -CIPSO option ..." and "Cleanup the Smack/NetLabel code ..." were ACK'd by Casey but had to be modified slightly today to address a last minute kernel oops and a minor merge collision with patches already in the security-testing-2.6 tree. I imagine when Casey sees this he will ACK them again but I removed his ACK in the meantime since the patches did change, however slightly.

I did run yesterday's patches (without the kernel oops fix) against Linus' tree from yesterday on my test systems without problem but I'm having a problem getting a clean kernel build using Linus' current tree so I'm unable to do a sanity check at present. That said, I am able to build the relevant code sections/modules without issue and am fairly confident there should not be any issues.

---

Etienne Basset (1):
smack: Add a new '-CIPSO' option to the network address label configuration

Paul Moore (5):
netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections
lsm: Remove the socket_post_accept() hook
selinux: Remove the "compat_net" compatibility code
netlabel: Label incoming TCP connections correctly in SELinux
lsm: Relocate the IPv4 security_inet_conn_request() hooks

 Documentation/Smack.txt                    |   42 ++++
 Documentation/feature-removal-schedule.txt |   11 -
 Documentation/kernel-parameters.txt        |    9 -
 include/linux/security.h                   |   13 -
 include/net/cipso_ipv4.h                   |   17 ++
 include/net/netlabel.h                     |   17 ++
 net/ipv4/cipso_ipv4.c                      |  130 ++++++++++++-
 net/ipv4/syncookies.c                      |    9 +
 net/ipv4/tcp_ipv4.c                        |    7 -
 net/netlabel/netlabel_kapi.c               |  165 +++++++++++++++--
 net/socket.c                               |    2 
 security/capability.c                      |    5 -
 security/security.c                        |    5 -
 security/selinux/hooks.c                   |  207 ++-------------------
 security/selinux/include/netlabel.h        |   27 +--
 security/selinux/netlabel.c                |  186 +++++--------------
 security/selinux/selinuxfs.c               |   68 -------
 security/smack/smack.h                     |    4 
 security/smack/smack_access.c              |    3 
 security/smack/smack_lsm.c                 |  271 ++++++++++++++++------------
 security/smack/smackfs.c                   |   38 +++-
 21 files changed, 618 insertions(+), 618 deletions(-)