History

Merge tag 'selinux-pr-20180403' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Pull SELinux updates from Paul Moore: "A bigger than usual pull request for SELinux, 13 patches (lucky!) along with a scary looking diffstat. Although if you look a bit closer, excluding the usual minor tweaks/fixes, there are really only two significant changes in this pull request: the addition of proper SELinux access controls for SCTP and the encapsulation of a lot of internal SELinux state. The SCTP changes are the result of a multi-month effort (maybe even a year or longer?) between the SELinux folks and the SCTP folks to add proper SELinux controls. A special thanks go to Richard for seeing this through and keeping the effort moving forward. The state encapsulation work is a bit of janitorial work that came out of some early work on SELinux namespacing. The question of namespacing is still an open one, but I believe there is some real value in the encapsulation work so we've split that out and are now sending that up to you" * tag 'selinux-pr-20180403' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux: selinux: wrap AVC state selinux: wrap selinuxfs state selinux: fix handling of uninitialized selinux state in get_bools/classes selinux: Update SELinux SCTP documentation selinux: Fix ltp test connect-syscall failure selinux: rename the {is,set}_enforcing() functions selinux: wrap global selinux state selinux: fix typo in selinux_netlbl_sctp_sk_clone declaration selinux: Add SCTP support sctp: Add LSM hooks sctp: Add ip option support security: Add support for SCTP security hooks netlabel: If PF_INET6, check sk_buff ip header version

Linus Torvalds committed 8 years ago

Commit 9eda2d22 parents 6ad11bd 6b6bc6243 files · +2936 −1252Browse files

Showing the changes to include/uapi/linux (1 of 43 files). Show all

Unified · Split

include/uapi/linux/sctp.h+1−0
@@ -127,6 +127,7 @@ typedef __s32 sctp_assoc_t; · 126 unmodified lines
127#define SCTP_STREAM_SCHEDULER 123127#define SCTP_STREAM_SCHEDULER 123
128#define SCTP_STREAM_SCHEDULER_VALUE 124128#define SCTP_STREAM_SCHEDULER_VALUE 124
129#define SCTP_INTERLEAVING_SUPPORTED 125129#define SCTP_INTERLEAVING_SUPPORTED 125
130#define SCTP_SENDMSG_CONNECT 126
130 131
131/* PR-SCTP policies */132/* PR-SCTP policies */
132#define SCTP_PR_SCTP_NONE 0x0000133#define SCTP_PR_SCTP_NONE 0x0000