diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
| commit | 4d6ca227c768b50b05cf183974b40abe444e9d0c (patch) | |
| tree | bf953d8e895281053548b9967a2c4b58d641df00 /security/selinux/include/classmap.h | |
| parent | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (diff) | |
| parent | af22a610bc38508d5ea760507d31be6b6983dfa8 (diff) | |
Merge branch 'for-4.12/asus' into for-linus
Diffstat (limited to 'security/selinux/include/classmap.h')
| -rw-r--r-- | security/selinux/include/classmap.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/include/classmap.h b/security/selinux/include/classmap.h index 7898ffa6d3e6..d429c4a1c551 100644 --- a/security/selinux/include/classmap.h +++ b/security/selinux/include/classmap.h | |||
| @@ -229,9 +229,11 @@ struct security_class_mapping secclass_map[] = { | |||
| 229 | { COMMON_SOCK_PERMS, NULL } }, | 229 | { COMMON_SOCK_PERMS, NULL } }, |
| 230 | { "qipcrtr_socket", | 230 | { "qipcrtr_socket", |
| 231 | { COMMON_SOCK_PERMS, NULL } }, | 231 | { COMMON_SOCK_PERMS, NULL } }, |
| 232 | { "smc_socket", | ||
| 233 | { COMMON_SOCK_PERMS, NULL } }, | ||
| 232 | { NULL } | 234 | { NULL } |
| 233 | }; | 235 | }; |
| 234 | 236 | ||
| 235 | #if PF_MAX > 43 | 237 | #if PF_MAX > 44 |
| 236 | #error New address family defined, please update secclass_map. | 238 | #error New address family defined, please update secclass_map. |
| 237 | #endif | 239 | #endif |