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

Fix possible NULL-pointer deref in error case (same as DEVFS).

Browse Source
This commit is contained in:
Eivind Eklund 1998-12-16 00:10:51 +00:00
parent af00b35dfe
commit e910d98670
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/fs/specfs/spec_vnops.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
* $Id: spec_vnops.c,v 1.76 1998/10/31 15:31:24 peter Exp $ * $Id: spec_vnops.c,v 1.77 1998/12/07 21:58:33 archie Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -379,11 +379,11 @@ spec_write(ap)
bp = getblk(vp, bn, bsize, 0, 0); bp = getblk(vp, bn, bsize, 0, 0);
else else
error = bread(vp, bn, bsize, NOCRED, &bp); error = bread(vp, bn, bsize, NOCRED, &bp);
n = min(n, bsize - bp->b_resid);
if (error) { if (error) {
brelse(bp); brelse(bp);
return (error); return (error);
} }
n = min(n, bsize - bp->b_resid);
error = uiomove((char *)bp->b_data + on, n, uio); error = uiomove((char *)bp->b_data + on, n, uio);
if (n + on == bsize) if (n + on == bsize)
bawrite(bp); bawrite(bp);

4
sys/miscfs/specfs/spec_vnops.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
* $Id: spec_vnops.c,v 1.76 1998/10/31 15:31:24 peter Exp $ * $Id: spec_vnops.c,v 1.77 1998/12/07 21:58:33 archie Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -379,11 +379,11 @@ spec_write(ap)
bp = getblk(vp, bn, bsize, 0, 0); bp = getblk(vp, bn, bsize, 0, 0);
else else
error = bread(vp, bn, bsize, NOCRED, &bp); error = bread(vp, bn, bsize, NOCRED, &bp);
n = min(n, bsize - bp->b_resid);
if (error) { if (error) {
brelse(bp); brelse(bp);
return (error); return (error);
} }
n = min(n, bsize - bp->b_resid);
error = uiomove((char *)bp->b_data + on, n, uio); error = uiomove((char *)bp->b_data + on, n, uio);
if (n + on == bsize) if (n + on == bsize)
bawrite(bp); bawrite(bp);