Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply revision 1.31 yet again: 

"make sure that we don't try to allocate negative memory when blks == 0."
or on amd64, "make sure that we don't allocate 32 GB when blks == 0."
This commit is contained in:
chs 2007-04-12 05:19:18 +00:00
parent 5672861f48
commit cb9ef1cfbd
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/fsck_ffs/inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inode.c,v 1.57 2006/04/21 15:00:49 skrll Exp $ */ /* $NetBSD: inode.c,v 1.58 2007/04/12 05:19:18 chs Exp $ */
/* /*
* Copyright (c) 1980, 1986, 1993 * Copyright (c) 1980, 1986, 1993
@ -34,7 +34,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: inode.c,v 1.57 2006/04/21 15:00:49 skrll Exp $"); __RCSID("$NetBSD: inode.c,v 1.58 2007/04/12 05:19:18 chs Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -477,7 +477,7 @@ cacheino(union dinode *dp, ino_t inumber)
{ {
struct inoinfo *inp; struct inoinfo *inp;
struct inoinfo **inpp, **ninpsort; struct inoinfo **inpp, **ninpsort;
unsigned int blks; unsigned int blks, extra;
int i; int i;
int64_t size; int64_t size;
@ -485,9 +485,11 @@ cacheino(union dinode *dp, ino_t inumber)
blks = howmany(size, sblock->fs_bsize); blks = howmany(size, sblock->fs_bsize);
if (blks > NDADDR) if (blks > NDADDR)
blks = NDADDR + NIADDR; blks = NDADDR + NIADDR;
if (blks > 0)
inp = (struct inoinfo *) malloc(sizeof(*inp) + (blks - 1) extra = (blks - 1) * sizeof (int64_t);
* sizeof (int64_t)); else
extra = 0;
inp = malloc(sizeof(*inp) + extra);
if (inp == NULL) if (inp == NULL)
return; return;
inpp = &inphead[inumber % dirhash]; inpp = &inphead[inumber % dirhash];