diff options
| author |   James Morris <james.l.morris@oracle.com> | 2017-01-27 09:23:21 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-01-27 09:23:21 +1100 |
| commit | 710584b9daefe25a2b5dc2c6c10dbb00e1b3b451 (patch) | |
| tree | 009861b1deb7839b99ca3c39de98e85b943da3f4 /security/smack/smack.h | |
| parent | tpm: Check size of response before accessing data (diff) | |
| parent | Smack: ignore private inode for file functions (diff) | |
| download | linux-dev-710584b9daefe25a2b5dc2c6c10dbb00e1b3b451.tar.xz linux-dev-710584b9daefe25a2b5dc2c6c10dbb00e1b3b451.zip | |
Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next
Diffstat (limited to 'security/smack/smack.h')
| -rw-r--r-- | security/smack/smack.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index 77abe2efacae..612b810fbbc6 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h @@ -114,6 +114,7 @@ struct inode_smack { struct smack_known *smk_mmap; /* label of the mmap domain */ struct mutex smk_lock; /* initialization lock */ int smk_flags; /* smack inode flags */ + struct rcu_head smk_rcu; /* for freeing inode_smack */ }; struct task_smack { @@ -173,6 +174,8 @@ struct smk_port_label { unsigned short smk_port; /* the port number */ struct smack_known *smk_in; /* inbound label */ struct smack_known *smk_out; /* outgoing label */ + short smk_sock_type; /* Socket type */ + short smk_can_reuse; }; #endif /* SMACK_IPV6_PORT_LABELING */ |