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

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  Net/Security: fix memory leaks from security_secid_to_secctx()
  SELinux: remove redundant pointer checks before calling kfree()
  SELinux: restore proper NetLabel caching behavior

...

This commit is contained in:

Linus Torvalds 2007-08-02 11:14:54 -07:00

parent 22f675f320 e6e0871cce

commit 160d6aaf60

5 changed files with 21 additions and 9 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

2

include/net/netlabel.h

View file

4

net/netlabel/netlabel_user.c

View file

5

net/xfrm/xfrm_policy.c

View file

3

security/selinux/hooks.c

View file

16

security/selinux/netlabel.c

View file