Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  smack: Add a new '-CIPSO' option to the network address label configuration
  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
  TOMOYO: Fix a typo.
  smack: convert smack to standard linux lists

...

This commit is contained in:

Linus Torvalds 2009-03-28 17:30:42 -07:00

parent 795e2fe0a3 4303154e86

commit 7541bba880

22 changed files with 783 additions and 737 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

130

net/ipv4/cipso_ipv4.c

View file

9

net/ipv4/syncookies.c

View file

7

net/ipv4/tcp_ipv4.c

View file

165

net/netlabel/netlabel_kapi.c

View file

2

net/socket.c

View file