diff options
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index bb4c80fdfe7a..9f56fb8a4a6c 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -1341,8 +1341,8 @@ struct security_operations { | |||
1341 | int (*unix_may_send) (struct socket * sock, struct socket * other); | 1341 | int (*unix_may_send) (struct socket * sock, struct socket * other); |
1342 | 1342 | ||
1343 | int (*socket_create) (int family, int type, int protocol, int kern); | 1343 | int (*socket_create) (int family, int type, int protocol, int kern); |
1344 | void (*socket_post_create) (struct socket * sock, int family, | 1344 | int (*socket_post_create) (struct socket * sock, int family, |
1345 | int type, int protocol, int kern); | 1345 | int type, int protocol, int kern); |
1346 | int (*socket_bind) (struct socket * sock, | 1346 | int (*socket_bind) (struct socket * sock, |
1347 | struct sockaddr * address, int addrlen); | 1347 | struct sockaddr * address, int addrlen); |
1348 | int (*socket_connect) (struct socket * sock, | 1348 | int (*socket_connect) (struct socket * sock, |
@@ -2824,13 +2824,13 @@ static inline int security_socket_create (int family, int type, | |||
2824 | return security_ops->socket_create(family, type, protocol, kern); | 2824 | return security_ops->socket_create(family, type, protocol, kern); |
2825 | } | 2825 | } |
2826 | 2826 | ||
2827 | static inline void security_socket_post_create(struct socket * sock, | 2827 | static inline int security_socket_post_create(struct socket * sock, |
2828 | int family, | 2828 | int family, |
2829 | int type, | 2829 | int type, |
2830 | int protocol, int kern) | 2830 | int protocol, int kern) |
2831 | { | 2831 | { |
2832 | security_ops->socket_post_create(sock, family, type, | 2832 | return security_ops->socket_post_create(sock, family, type, |
2833 | protocol, kern); | 2833 | protocol, kern); |
2834 | } | 2834 | } |
2835 | 2835 | ||
2836 | static inline int security_socket_bind(struct socket * sock, | 2836 | static inline int security_socket_bind(struct socket * sock, |
@@ -2982,11 +2982,12 @@ static inline int security_socket_create (int family, int type, | |||
2982 | return 0; | 2982 | return 0; |
2983 | } | 2983 | } |
2984 | 2984 | ||
2985 | static inline void security_socket_post_create(struct socket * sock, | 2985 | static inline int security_socket_post_create(struct socket * sock, |
2986 | int family, | 2986 | int family, |
2987 | int type, | 2987 | int type, |
2988 | int protocol, int kern) | 2988 | int protocol, int kern) |
2989 | { | 2989 | { |
2990 | return 0; | ||
2990 | } | 2991 | } |
2991 | 2992 | ||
2992 | static inline int security_socket_bind(struct socket * sock, | 2993 | static inline int security_socket_bind(struct socket * sock, |