diff options
| author |   miod <miod@openbsd.org> | 2011-04-12 20:18:13 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2011-04-12 20:18:13 +0000 |
| commit | 4faaefd7e9b50daf1763f84418447028d6f8d891 (patch) | |
| tree | 28ef393db28b494e1d0af7c2fcd9c365adbb58ba | |
| parent | Avoid kvm starvation due to softdeps waiting on too many mapped buffers, (diff) | |
| download | wireguard-openbsd-4faaefd7e9b50daf1763f84418447028d6f8d891.tar.xz wireguard-openbsd-4faaefd7e9b50daf1763f84418447028d6f8d891.zip | |
Fix uninitialized variable access introduced in 1.58, causing read access
to possibly favor the mirror instead of the main ccd by incorrectly
considering the main ccd is in the failure state, for interleaved+mirrored
ccds.
ok deraadt@
| -rw-r--r-- | sys/dev/ccd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c index 3b6446a154a..0fcc9747874 100644 --- a/sys/dev/ccd.c +++ b/sys/dev/ccd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccd.c,v 1.92 2010/09/22 01:18:57 matthew Exp $ */ +/* $OpenBSD: ccd.c,v 1.93 2011/04/12 20:18:13 miod Exp $ */ /* $NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $ */ /*- @@ -795,6 +795,7 @@ ccdbuffer(struct ccd_softc *cs, struct buf *bp, daddr64_t bn, caddr_t addr, ccdisk = ii->ii_index[off % ii->ii_ndisk]; cbn = ii->ii_startoff + off / ii->ii_ndisk; } + ci = &cs->sc_cinfo[ccdisk]; if (cs->sc_cflags & CCDF_MIRROR) { /* Mirrored data */ ccdisk2 = ccdisk + ii->ii_ndisk; @@ -803,11 +804,12 @@ ccdbuffer(struct ccd_softc *cs, struct buf *bp, daddr64_t bn, caddr_t addr, if (bp->b_flags & B_READ && bcount > bp->b_bcount / 2 && (!(ci2->ci_flags & CCIF_FAILED) || - ci->ci_flags & CCIF_FAILED)) + ci->ci_flags & CCIF_FAILED)) { ccdisk = ccdisk2; + ci = ci2; + } } cbn *= cs->sc_ileave; - ci = &cs->sc_cinfo[ccdisk]; CCD_DPRINTF(CCDB_IO, ("ccdisk %d cbn %lld ci %p ci2 %p\n", ccdisk, cbn, ci, ci2)); } |