diff options
author | Stephen Smalley <sds@tycho.nsa.gov> | 2015-06-10 08:44:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-10 22:49:20 -0700 |
commit | 37a9a8df8ce9de6ea73349c9ac8bdf6ba4ec4f70 (patch) | |
tree | 255b2d8c931e665feabf697cfd28f633f44232ea /include/net | |
parent | bae23b6840a6a15947173d8282028458dbcdeb5b (diff) | |
download | linux-37a9a8df8ce9de6ea73349c9ac8bdf6ba4ec4f70.tar.gz linux-37a9a8df8ce9de6ea73349c9ac8bdf6ba4ec4f70.tar.bz2 linux-37a9a8df8ce9de6ea73349c9ac8bdf6ba4ec4f70.zip |
net/unix: support SCM_SECURITY for stream sockets
SCM_SECURITY was originally only implemented for datagram sockets,
not for stream sockets. However, SCM_CREDENTIALS is supported on
Unix stream sockets. For consistency, implement Unix stream support
for SCM_SECURITY as well. Also clean up the existing code and get
rid of the superfluous UNIXSID macro.
Motivated by https://bugzilla.redhat.com/show_bug.cgi?id=1224211,
where systemd was using SCM_CREDENTIALS and assumed wrongly that
SCM_SECURITY was also supported on Unix stream sockets.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/af_unix.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index a175ba4a7adb..4a167b30a12f 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -39,7 +39,6 @@ struct unix_skb_parms { }; #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb)) -#define UNIXSID(skb) (&UNIXCB((skb)).secid) #define unix_state_lock(s) spin_lock(&unix_sk(s)->lock) #define unix_state_unlock(s) spin_unlock(&unix_sk(s)->lock) |