diff options
| author | pjd <pjd@FreeBSD.org> | 2010-10-22 22:44:09 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2010-10-22 22:44:09 +0000 |
| commit | 8ba9fc913b2937f79c0fb33a3c4e7dc1601d7891 (patch) | |
| tree | 0bd5e072e3c1e5bab3365846fe41a96e8f6b04cf /sys/geom | |
| parent | b022d9547307fbceeac6ec2faa6ad85e69251dce (diff) | |
| download | FreeBSD-src-8ba9fc913b2937f79c0fb33a3c4e7dc1601d7891.zip FreeBSD-src-8ba9fc913b2937f79c0fb33a3c4e7dc1601d7891.tar.gz | |
Encryption keys array might be NULL if device is suspended. Check for this, so
we don't panic when we detach suspended device.
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/eli/g_eli.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c index fd04ee2..08219dc 100644 --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -952,9 +952,12 @@ g_eli_destroy(struct g_eli_softc *sc, boolean_t force) } mtx_destroy(&sc->sc_queue_mtx); gp->softc = NULL; - bzero(sc->sc_ekeys, - sc->sc_nekeys * (sizeof(uint8_t *) + G_ELI_DATAKEYLEN)); - free(sc->sc_ekeys, M_ELI); + if (sc->sc_ekeys != NULL) { + /* The sc_ekeys field can be NULL is device is suspended. */ + bzero(sc->sc_ekeys, + sc->sc_nekeys * (sizeof(uint8_t *) + G_ELI_DATAKEYLEN)); + free(sc->sc_ekeys, M_ELI); + } bzero(sc, sizeof(*sc)); free(sc, M_ELI); |
