diff options
Diffstat (limited to 'include/linux/net.h')
-rw-r--r-- | include/linux/net.h | 109 |
1 files changed, 63 insertions, 46 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 4f27575ce1d6..b292a0435571 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ | 24 | #include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ |
25 | #include <linux/kmemcheck.h> | 25 | #include <linux/kmemcheck.h> |
26 | #include <linux/rcupdate.h> | 26 | #include <linux/rcupdate.h> |
27 | #include <linux/jump_label.h> | ||
27 | #include <uapi/linux/net.h> | 28 | #include <uapi/linux/net.h> |
28 | 29 | ||
29 | struct poll_table_struct; | 30 | struct poll_table_struct; |
@@ -195,27 +196,23 @@ enum { | |||
195 | SOCK_WAKE_URG, | 196 | SOCK_WAKE_URG, |
196 | }; | 197 | }; |
197 | 198 | ||
198 | extern int sock_wake_async(struct socket *sk, int how, int band); | 199 | int sock_wake_async(struct socket *sk, int how, int band); |
199 | extern int sock_register(const struct net_proto_family *fam); | 200 | int sock_register(const struct net_proto_family *fam); |
200 | extern void sock_unregister(int family); | 201 | void sock_unregister(int family); |
201 | extern int __sock_create(struct net *net, int family, int type, int proto, | 202 | int __sock_create(struct net *net, int family, int type, int proto, |
202 | struct socket **res, int kern); | 203 | struct socket **res, int kern); |
203 | extern int sock_create(int family, int type, int proto, | 204 | int sock_create(int family, int type, int proto, struct socket **res); |
204 | struct socket **res); | 205 | int sock_create_kern(int family, int type, int proto, struct socket **res); |
205 | extern int sock_create_kern(int family, int type, int proto, | 206 | int sock_create_lite(int family, int type, int proto, struct socket **res); |
206 | struct socket **res); | 207 | void sock_release(struct socket *sock); |
207 | extern int sock_create_lite(int family, int type, int proto, | 208 | int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); |
208 | struct socket **res); | 209 | int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, |
209 | extern void sock_release(struct socket *sock); | 210 | int flags); |
210 | extern int sock_sendmsg(struct socket *sock, struct msghdr *msg, | 211 | struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname); |
211 | size_t len); | 212 | struct socket *sockfd_lookup(int fd, int *err); |
212 | extern int sock_recvmsg(struct socket *sock, struct msghdr *msg, | 213 | struct socket *sock_from_file(struct file *file, int *err); |
213 | size_t size, int flags); | ||
214 | extern struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname); | ||
215 | extern struct socket *sockfd_lookup(int fd, int *err); | ||
216 | extern struct socket *sock_from_file(struct file *file, int *err); | ||
217 | #define sockfd_put(sock) fput(sock->file) | 214 | #define sockfd_put(sock) fput(sock->file) |
218 | extern int net_ratelimit(void); | 215 | int net_ratelimit(void); |
219 | 216 | ||
220 | #define net_ratelimited_function(function, ...) \ | 217 | #define net_ratelimited_function(function, ...) \ |
221 | do { \ | 218 | do { \ |
@@ -243,32 +240,52 @@ do { \ | |||
243 | #define net_random() prandom_u32() | 240 | #define net_random() prandom_u32() |
244 | #define net_srandom(seed) prandom_seed((__force u32)(seed)) | 241 | #define net_srandom(seed) prandom_seed((__force u32)(seed)) |
245 | 242 | ||
246 | extern int kernel_sendmsg(struct socket *sock, struct msghdr *msg, | 243 | bool __net_get_random_once(void *buf, int nbytes, bool *done, |
247 | struct kvec *vec, size_t num, size_t len); | 244 | struct static_key *done_key); |
248 | extern int kernel_recvmsg(struct socket *sock, struct msghdr *msg, | 245 | |
249 | struct kvec *vec, size_t num, | 246 | #ifdef HAVE_JUMP_LABEL |
250 | size_t len, int flags); | 247 | #define ___NET_RANDOM_STATIC_KEY_INIT ((struct static_key) \ |
251 | 248 | { .enabled = ATOMIC_INIT(0), .entries = (void *)1 }) | |
252 | extern int kernel_bind(struct socket *sock, struct sockaddr *addr, | 249 | #else /* !HAVE_JUMP_LABEL */ |
253 | int addrlen); | 250 | #define ___NET_RANDOM_STATIC_KEY_INIT STATIC_KEY_INIT_FALSE |
254 | extern int kernel_listen(struct socket *sock, int backlog); | 251 | #endif /* HAVE_JUMP_LABEL */ |
255 | extern int kernel_accept(struct socket *sock, struct socket **newsock, | 252 | |
256 | int flags); | 253 | #define net_get_random_once(buf, nbytes) \ |
257 | extern int kernel_connect(struct socket *sock, struct sockaddr *addr, | 254 | ({ \ |
258 | int addrlen, int flags); | 255 | bool ___ret = false; \ |
259 | extern int kernel_getsockname(struct socket *sock, struct sockaddr *addr, | 256 | static bool ___done = false; \ |
260 | int *addrlen); | 257 | static struct static_key ___done_key = \ |
261 | extern int kernel_getpeername(struct socket *sock, struct sockaddr *addr, | 258 | ___NET_RANDOM_STATIC_KEY_INIT; \ |
262 | int *addrlen); | 259 | if (!static_key_true(&___done_key)) \ |
263 | extern int kernel_getsockopt(struct socket *sock, int level, int optname, | 260 | ___ret = __net_get_random_once(buf, \ |
264 | char *optval, int *optlen); | 261 | nbytes, \ |
265 | extern int kernel_setsockopt(struct socket *sock, int level, int optname, | 262 | &___done, \ |
266 | char *optval, unsigned int optlen); | 263 | &___done_key); \ |
267 | extern int kernel_sendpage(struct socket *sock, struct page *page, int offset, | 264 | ___ret; \ |
268 | size_t size, int flags); | 265 | }) |
269 | extern int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg); | 266 | |
270 | extern int kernel_sock_shutdown(struct socket *sock, | 267 | int kernel_sendmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec, |
271 | enum sock_shutdown_cmd how); | 268 | size_t num, size_t len); |
269 | int kernel_recvmsg(struct socket *sock, struct msghdr *msg, struct kvec *vec, | ||
270 | size_t num, size_t len, int flags); | ||
271 | |||
272 | int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen); | ||
273 | int kernel_listen(struct socket *sock, int backlog); | ||
274 | int kernel_accept(struct socket *sock, struct socket **newsock, int flags); | ||
275 | int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen, | ||
276 | int flags); | ||
277 | int kernel_getsockname(struct socket *sock, struct sockaddr *addr, | ||
278 | int *addrlen); | ||
279 | int kernel_getpeername(struct socket *sock, struct sockaddr *addr, | ||
280 | int *addrlen); | ||
281 | int kernel_getsockopt(struct socket *sock, int level, int optname, char *optval, | ||
282 | int *optlen); | ||
283 | int kernel_setsockopt(struct socket *sock, int level, int optname, char *optval, | ||
284 | unsigned int optlen); | ||
285 | int kernel_sendpage(struct socket *sock, struct page *page, int offset, | ||
286 | size_t size, int flags); | ||
287 | int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg); | ||
288 | int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how); | ||
272 | 289 | ||
273 | #define MODULE_ALIAS_NETPROTO(proto) \ | 290 | #define MODULE_ALIAS_NETPROTO(proto) \ |
274 | MODULE_ALIAS("net-pf-" __stringify(proto)) | 291 | MODULE_ALIAS("net-pf-" __stringify(proto)) |