diff options
author | phk <phk@FreeBSD.org> | 2002-09-27 20:47:23 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-09-27 20:47:23 +0000 |
commit | 5002cfbb7eb2c253e16d44b1cb09d24e86fae96f (patch) | |
tree | cbf3960b54abc9b9f5fe0f6e11921ee7275428b2 /sys/geom/geom_slice.c | |
parent | 83aec680cb55261466c7d21ac999144f9985d59e (diff) | |
download | FreeBSD-src-5002cfbb7eb2c253e16d44b1cb09d24e86fae96f.zip FreeBSD-src-5002cfbb7eb2c253e16d44b1cb09d24e86fae96f.tar.gz |
Add checks for g_clone_bio() returning NULL, it will be possible RSN.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/geom/geom_slice.c')
-rw-r--r-- | sys/geom/geom_slice.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c index ab781d5..5bd20ea 100644 --- a/sys/geom/geom_slice.c +++ b/sys/geom/geom_slice.c @@ -72,7 +72,8 @@ g_slice_init(unsigned nslice, unsigned scsize) gsp = g_malloc(sizeof *gsp, M_WAITOK | M_ZERO); gsp->softc = g_malloc(scsize, M_WAITOK | M_ZERO); - gsp->slices = g_malloc(nslice * sizeof(struct g_slice), M_WAITOK | M_ZERO); + gsp->slices = g_malloc(nslice * sizeof(struct g_slice), + M_WAITOK | M_ZERO); gsp->nslice = nslice; return (gsp); } @@ -148,6 +149,10 @@ g_slice_start(struct bio *bp) return; } bp2 = g_clone_bio(bp); + if (bp2 == NULL) { + g_io_fail(bp, ENOMEM); + return; + } if (bp2->bio_offset + bp2->bio_length > gsl->length) bp2->bio_length = gsl->length - bp2->bio_offset; bp2->bio_done = g_std_done; |