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

Use G_RAID3_FOREACH_SAFE_BIO() macro instead of G_RAID3_FOREACH_BIO() in

Browse Source 
two places where g_io_request() is called. g_io_request() can free bio
structure so we can't reference it after and G_RAID3_FOREACH_BIO() macro
was doing this.

Found by:	Coverity Prevent analysis tool (with my new models)
MFC after:	1 day
This commit is contained in:
Pawel Jakub Dawidek 2006-05-04 13:01:16 +00:00
parent 920b61d0bf
commit ee40c7aa76
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/geom/raid3/g_raid3.c
View File

@ -1009,7 +1009,7 @@ g_raid3_scatter(struct bio *pbp)
{
struct g_raid3_softc *sc;
struct g_raid3_disk *disk;
struct bio *bp, *cbp;
struct bio *bp, *cbp, *tmpbp;
off_t atom, cadd, padd, left;
sc = pbp->bio_to->geom->softc;
@ -1038,8 +1038,6 @@ g_raid3_scatter(struct bio *pbp)
cadd += atom;
}
if ((pbp->bio_pflags & G_RAID3_BIO_PFLAG_NOPARITY) == 0) {
struct bio *tmpbp;
/*
* Calculate parity.
*/
@ -1053,7 +1051,7 @@ g_raid3_scatter(struct bio *pbp)
g_raid3_destroy_bio(sc, cbp);
}
}
G_RAID3_FOREACH_BIO(pbp, cbp) {
G_RAID3_FOREACH_SAFE_BIO(pbp, cbp, tmpbp) {
struct g_consumer *cp;
disk = cbp->bio_caller2;
@ -1685,7 +1683,7 @@ g_raid3_register_request(struct bio *pbp)
struct g_raid3_softc *sc;
struct g_raid3_disk *disk;
struct g_consumer *cp;
struct bio *cbp;
struct bio *cbp, *tmpbp;
off_t offset, length;
u_int n, ndisks;
int round_robin, verify;
@ -1831,7 +1829,7 @@ g_raid3_register_request(struct bio *pbp)
*/
sc->sc_round_robin = 0;
}
G_RAID3_FOREACH_BIO(pbp, cbp) {
G_RAID3_FOREACH_SAFE_BIO(pbp, cbp, tmpbp) {
disk = cbp->bio_caller2;
cp = disk->d_consumer;
cbp->bio_to = cp->provider;