diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 22:14:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-02 22:14:54 +0400 |
| commit | 160d6aaf60d75b71a48223b5bdc29285e18cff07 (patch) | |
| tree | 62b9b82059dc3fd8353f9daf7f83da4293f7a493 /include | |
| parent | 22f675f320f721e9eaa2bbf7b883316b408c6c8f (diff) | |
| parent | e6e0871cce2ae04f5790543ad2f4ec36b23260ba (diff) | |
| download | linux-160d6aaf60d75b71a48223b5bdc29285e18cff07.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* '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
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netlabel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netlabel.h b/include/net/netlabel.h index ffbc7f28335a..2e5b2f6f9fa0 100644 --- a/include/net/netlabel.h +++ b/include/net/netlabel.h @@ -132,6 +132,8 @@ struct netlbl_lsm_secattr_catmap { #define NETLBL_SECATTR_CACHE 0x00000002 #define NETLBL_SECATTR_MLS_LVL 0x00000004 #define NETLBL_SECATTR_MLS_CAT 0x00000008 +#define NETLBL_SECATTR_CACHEABLE (NETLBL_SECATTR_MLS_LVL | \ + NETLBL_SECATTR_MLS_CAT) struct netlbl_lsm_secattr { u32 flags; |