aboutsummaryrefslogtreecommitdiff
path: root/security/smack/smack.h
diff options
context:
space:
mode:
authorPaul Moore <paul.moore@hp.com>2009-03-27 17:10:54 -0400
committerJames Morris <jmorris@namei.org>2009-03-28 15:01:37 +1100
commit07feee8f812f7327a46186f7604df312c8c81962 (patch)
tree73eac643b60532aa82d7680a7de193ba2b62eddd /security/smack/smack.h
parent8651d5c0b1f874c5b8307ae2b858bc40f9f02482 (diff)
downloadlinux-linaro-stable-07feee8f812f7327a46186f7604df312c8c81962.tar.gz
netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections
This patch cleans up a lot of the Smack network access control code. The largest changes are to fix the labeling of incoming TCP connections in a manner similar to the recent SELinux changes which use the security_inet_conn_request() hook to label the request_sock and let the label move to the child socket via the normal network stack mechanisms. In addition to the incoming TCP connection fixes this patch also removes the smk_labled field from the socket_smack struct as the minor optimization advantage was outweighed by the difficulty in maintaining it's proper state. Signed-off-by: Paul Moore <paul.moore@hp.com> Acked-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/smack/smack.h')
-rw-r--r--security/smack/smack.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h
index 64164f8fde70..5e5a3bcb599a 100644
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -42,7 +42,6 @@ struct superblock_smack {
struct socket_smack {
char *smk_out; /* outbound label */
char *smk_in; /* inbound label */
- int smk_labeled; /* label scheme */
char smk_packet[SMK_LABELLEN]; /* TCP peer label */
};