d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid dereferencing a possibly null pointer.

Browse Source 
Reported by: Coverity
CID:         1475868
This commit is contained in:
Kirk McKusick 2022-04-06 14:25:11 -07:00
parent c5a7885c80
commit 4710aa248b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/geom/union/g_union.c
View File

@ -1317,31 +1317,31 @@ g_union_destroy(struct gctl_req *req, struct g_geom *gp, bool force)
if (force) { if (force) {
if (req != NULL) if (req != NULL)
gctl_msg(req, "Device %s is still in use, " gctl_msg(req, "Device %s is still in use, "
"so is being forcibly removed.", pp->name); "so is being forcibly removed.", gp->name);
G_UNION_DEBUG(1, "Device %s is still in use, so " G_UNION_DEBUG(1, "Device %s is still in use, so "
"is being forcibly removed.", pp->name); "is being forcibly removed.", gp->name);
} else { } else {
if (req != NULL) if (req != NULL)
gctl_msg(req, "Device %s is still open " gctl_msg(req, "Device %s is still open "
"(r=%d w=%d e=%d).", pp->name, pp->acr, "(r=%d w=%d e=%d).", gp->name, pp->acr,
pp->acw, pp->ace); pp->acw, pp->ace);
G_UNION_DEBUG(1, "Device %s is still open " G_UNION_DEBUG(1, "Device %s is still open "
"(r=%d w=%d e=%d).", pp->name, pp->acr, "(r=%d w=%d e=%d).", gp->name, pp->acr,
pp->acw, pp->ace); pp->acw, pp->ace);
return (EBUSY); return (EBUSY);
} }
} else { } else {
if (req != NULL) if (req != NULL)
gctl_msg(req, "Device %s removed.", pp->name); gctl_msg(req, "Device %s removed.", gp->name);
G_UNION_DEBUG(1, "Device %s removed.", pp->name); G_UNION_DEBUG(1, "Device %s removed.", gp->name);
} }
/* Close consumers */ /* Close consumers */
if ((error = g_access(sc->sc_lowercp, -1, 0, -1)) != 0) if ((error = g_access(sc->sc_lowercp, -1, 0, -1)) != 0)
G_UNION_DEBUG(2, "Error %d: device %s could not reset access " G_UNION_DEBUG(2, "Error %d: device %s could not reset access "
"to %s.", error, pp->name, sc->sc_lowercp->provider->name); "to %s.", error, gp->name, sc->sc_lowercp->provider->name);
if ((error = g_access(sc->sc_uppercp, -1, -1, -1)) != 0) if ((error = g_access(sc->sc_uppercp, -1, -1, -1)) != 0)
G_UNION_DEBUG(2, "Error %d: device %s could not reset access " G_UNION_DEBUG(2, "Error %d: device %s could not reset access "
"to %s.", error, pp->name, sc->sc_uppercp->provider->name); "to %s.", error, gp->name, sc->sc_uppercp->provider->name);
g_wither_geom(gp, ENXIO); g_wither_geom(gp, ENXIO);