diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2007-02-26 10:45:21 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2007-02-26 10:45:21 +0000 |
| commit | fac61393b9ffbca29c4ee9c213a84102c1f7b714 (patch) | |
| tree | d898d9ec565518178ef02634f4397e0b72663f21 /sys/kern/uipc_socket.c | |
| parent | e89beb720d5af72fc618ed1c2e44a4a768f49cb7 (diff) | |
| download | src-fac61393b9ffbca29c4ee9c213a84102c1f7b714.tar.gz src-fac61393b9ffbca29c4ee9c213a84102c1f7b714.zip | |
Don't block on the socket zone limit during the socket()
call which can easily lock up a system otherwise; instead,
return ENOBUFS as documented in a manpage, thus reverting
us to the FreeBSD 4.x behavior.
Reviewed by: rwatson
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=167014
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index a8d27366554b..eaf45a0157b1 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -257,15 +257,15 @@ SYSINIT(param, SI_SUB_TUNABLES, SI_ORDER_ANY, init_maxsockets, NULL); * soalloc() returns a socket with a ref count of 0. */ static struct socket * -soalloc(int mflags) +soalloc(void) { struct socket *so; - so = uma_zalloc(socket_zone, mflags | M_ZERO); + so = uma_zalloc(socket_zone, M_NOWAIT | M_ZERO); if (so == NULL) return (NULL); #ifdef MAC - if (mac_init_socket(so, mflags) != 0) { + if (mac_init_socket(so, M_NOWAIT) != 0) { uma_zfree(socket_zone, so); return (NULL); } @@ -351,7 +351,7 @@ socreate(dom, aso, type, proto, cred, td) if (prp->pr_type != type) return (EPROTOTYPE); - so = soalloc(M_WAITOK); + so = soalloc(); if (so == NULL) return (ENOBUFS); @@ -416,7 +416,7 @@ sonewconn(head, connstatus) if (over) #endif return (NULL); - so = soalloc(M_NOWAIT); + so = soalloc(); if (so == NULL) return (NULL); if ((head->so_options & SO_ACCEPTFILTER) != 0) |