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

Fixed variable overflow problem.

Browse Source 
Obtained from:	NetBSD via Mark J. Taylor <mtaylor@cybernet.com>
This commit is contained in:
David Greenman 1999-03-11 18:50:39 +00:00
parent 8681b974c1
commit 40969e381b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ccd/ccd.c
View File

@ -1,4 +1,4 @@
/* $Id: ccd.c,v 1.41 1999/02/18 21:11:53 ken Exp $ */
/* $Id: ccd.c,v 1.42 1999/03/10 00:41:27 mjacob Exp $ */
/* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */
@ -841,6 +841,7 @@ ccdbuffer(cb, cs, bp, bn, addr, bcount)
register struct ccdcinfo *ci, *ci2 = NULL; /* XXX */
register struct ccdbuf *cbp;
register daddr_t cbn, cboff;
register off_t cbc;
#ifdef DEBUG
if (ccddebug & CCDB_IO)
@ -919,11 +920,10 @@ ccdbuffer(cb, cs, bp, bn, addr, bcount)
LIST_INIT(&cbp->cb_buf.b_dep);
cbp->cb_buf.b_resid = 0;
if (cs->sc_ileave == 0)
cbp->cb_buf.b_bcount = dbtob(ci->ci_size - cbn);
cbc = dbtob((off_t)(ci->ci_size - cbn));
else
cbp->cb_buf.b_bcount = dbtob(cs->sc_ileave - cboff);
if (cbp->cb_buf.b_bcount > bcount)
cbp->cb_buf.b_bcount = bcount;
cbc = dbtob((off_t)(cs->sc_ileave - cboff));
cbp->cb_buf.b_bcount = (cbc < bcount) ? cbc : bcount;
cbp->cb_buf.b_bufsize = cbp->cb_buf.b_bcount;

10
sys/geom/geom_ccd.c
View File

@ -1,4 +1,4 @@
/* $Id: ccd.c,v 1.41 1999/02/18 21:11:53 ken Exp $ */
/* $Id: ccd.c,v 1.42 1999/03/10 00:41:27 mjacob Exp $ */
/* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */
@ -841,6 +841,7 @@ ccdbuffer(cb, cs, bp, bn, addr, bcount)
register struct ccdcinfo *ci, *ci2 = NULL; /* XXX */
register struct ccdbuf *cbp;
register daddr_t cbn, cboff;
register off_t cbc;
#ifdef DEBUG
if (ccddebug & CCDB_IO)
@ -919,11 +920,10 @@ ccdbuffer(cb, cs, bp, bn, addr, bcount)
LIST_INIT(&cbp->cb_buf.b_dep);
cbp->cb_buf.b_resid = 0;
if (cs->sc_ileave == 0)
cbp->cb_buf.b_bcount = dbtob(ci->ci_size - cbn);
cbc = dbtob((off_t)(ci->ci_size - cbn));
else
cbp->cb_buf.b_bcount = dbtob(cs->sc_ileave - cboff);
if (cbp->cb_buf.b_bcount > bcount)
cbp->cb_buf.b_bcount = bcount;
cbc = dbtob((off_t)(cs->sc_ileave - cboff));
cbp->cb_buf.b_bcount = (cbc < bcount) ? cbc : bcount;
cbp->cb_buf.b_bufsize = cbp->cb_buf.b_bcount;