diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2012-05-24 18:22:57 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2012-05-24 18:22:57 +0000 |
| commit | 38f1b2d1bc7c01a74e3eb38b4b984d73cdef1742 (patch) | |
| tree | b30d6dfe0f1bee6d07b7a659a56345efe36d0b58 /sys/netgraph/ng_ksocket.c | |
| parent | d499701b0c5198988bee323f693b9057e2f16cee (diff) | |
| download | src-38f1b2d1bc7c01a74e3eb38b4b984d73cdef1742.tar.gz src-38f1b2d1bc7c01a74e3eb38b4b984d73cdef1742.zip | |
Revert r220768 for ng_ksocket. This node is special and
when it is cloning, its constructor method may be called
in a context that isn't allowed to sleep.
Noticed by: Vadim Goncharov
Notes
Notes:
svn path=/head/; revision=235923
Diffstat (limited to 'sys/netgraph/ng_ksocket.c')
| -rw-r--r-- | sys/netgraph/ng_ksocket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index d2e3a26400d3..cacb524f3a48 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -524,7 +524,9 @@ ng_ksocket_constructor(node_p node) priv_p priv; /* Allocate private structure */ - priv = malloc(sizeof(*priv), M_NETGRAPH_KSOCKET, M_WAITOK | M_ZERO); + priv = malloc(sizeof(*priv), M_NETGRAPH_KSOCKET, M_NOWAIT | M_ZERO); + if (priv == NULL) + return (ENOMEM); LIST_INIT(&priv->embryos); /* cross link them */ |