svn commit: r363429 - stable/12/sys/net

[Kristof Provost]

Author: kp
Date: Wed Jul 22 19:43:55 2020
New Revision: 363429
URL: https://svnweb.freebsd.org/changeset/base/363429

Log:
  MFC r363308:
  
  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

Modified:
  stable/12/sys/net/if_bridge.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/net/if_bridge.c
==============================================================================
--- stable/12/sys/net/if_bridge.c	Wed Jul 22 19:08:05 2020	(r363428)
+++ stable/12/sys/net/if_bridge.c	Wed Jul 22 19:43:55 2020	(r363429)
@@ -1467,9 +1467,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;
@@ -1529,9 +1529,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;
@@ -1857,9 +1857,9 @@ bridge_ioctl_gifsstp(struct bridge_softc *sc, void *ar
 		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;