diff options
| author | Kristof Provost <kp@FreeBSD.org> | 2020-07-18 12:43:11 +0000 |
|---|---|---|
| committer | Kristof Provost <kp@FreeBSD.org> | 2020-07-18 12:43:11 +0000 |
| commit | 93ed6ade6ecf8417b81e30f01e4cff4cbc1b71a1 (patch) | |
| tree | 75f90c817c21eb6d570ddb81c11c04d11939f293 | |
| parent | d5c5b4b382e3b6e3549287e313a0020162a0e686 (diff) | |
| download | src-93ed6ade6ecf8417b81e30f01e4cff4cbc1b71a1.tar.gz src-93ed6ade6ecf8417b81e30f01e4cff4cbc1b71a1.zip | |
bridge: Don't sleep during epoch
While it doesn't trigger INVARIANTS or WITNESS on head it does in stable/12.
There's also no reason for it, as we can easily report the out of memory error
to the caller (i.e. userspace). All of these can already fail.
PR: 248046
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=363308
| -rw-r--r-- | sys/net/if_bridge.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 19d8d8964d92..51ee9d299067 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1393,9 +1393,9 @@ bridge_ioctl_gifs(struct bridge_softc *sc, void *arg) bifc->ifbic_len = buflen; return (0); } - BRIDGE_UNLOCK(sc); - outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); - BRIDGE_LOCK(sc); + outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO); + if (outbuf == NULL) + return (ENOMEM); count = 0; buf = outbuf; @@ -1455,9 +1455,9 @@ bridge_ioctl_rts(struct bridge_softc *sc, void *arg) count++; buflen = sizeof(bareq) * count; - BRIDGE_UNLOCK(sc); - outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); - BRIDGE_LOCK(sc); + outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO); + if (outbuf == NULL) + return (ENOMEM); count = 0; buf = outbuf; @@ -1783,9 +1783,9 @@ bridge_ioctl_gifsstp(struct bridge_softc *sc, void *arg) return (0); } - BRIDGE_UNLOCK(sc); - outbuf = malloc(buflen, M_TEMP, M_WAITOK | M_ZERO); - BRIDGE_LOCK(sc); + outbuf = malloc(buflen, M_TEMP, M_NOWAIT | M_ZERO); + if (outbuf == NULL) + return (ENOMEM); count = 0; buf = outbuf; |