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

xen-blkfront: fix memory leak in xbd_connect error path

Browse Source 
If gnttab_grant_foreign_access() fails for any of the indirection
pages, the code breaks out of both the loops without freeing the local
variable indirectpages, causing a memory leak.

Submitted by:		Pratyush Yadav <pratyush@freebsd.org>
Differential Review:	https://reviews.freebsd.org/D16136
This commit is contained in:
royger 2018-07-30 11:27:51 +00:00
parent bed19de064
commit 13fa38d951
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/xen/blkfront/blkfront.c
View File

@ -1333,7 +1333,10 @@ xbd_connect(struct xbd_softc *sc)
if (sc->xbd_max_request_indirectpages > 0) {
indirectpages = contigmalloc(
PAGE_SIZE * sc->xbd_max_request_indirectpages,
M_XENBLOCKFRONT, M_ZERO, 0, ~0, PAGE_SIZE, 0);
M_XENBLOCKFRONT, M_ZERO | M_NOWAIT, 0, ~0,
PAGE_SIZE, 0);
if (indirectpages == NULL)
sc->xbd_max_request_indirectpages = 0;
} else {
indirectpages = NULL;
}
@ -1345,8 +1348,12 @@ xbd_connect(struct xbd_softc *sc)
&cm->cm_indirectionrefs[j]))
break;
}
if (j < sc->xbd_max_request_indirectpages)
if (j < sc->xbd_max_request_indirectpages) {
contigfree(indirectpages,
PAGE_SIZE * sc->xbd_max_request_indirectpages,
M_XENBLOCKFRONT);
break;
}
cm->cm_indirectionpages = indirectpages;
xbd_free_command(cm);
}