diff options
| author | daichi <daichi@FreeBSD.org> | 2006-07-11 17:27:04 +0000 |
|---|---|---|
| committer | daichi <daichi@FreeBSD.org> | 2006-07-11 17:27:04 +0000 |
| commit | 05bff8fb74812f6551cd13f62046027a7d91e606 (patch) | |
| tree | a2f62b62ea555ff6585c2cf5a16b204131a85b72 /sys/ufs | |
| parent | 6b04f8685ad77c024a8437529420fbbd18eae901 (diff) | |
| download | FreeBSD-src-05bff8fb74812f6551cd13f62046027a7d91e606.zip FreeBSD-src-05bff8fb74812f6551cd13f62046027a7d91e606.tar.gz | |
The ufs_lookup.c has a critical bug around the whiteout
process. UFS must check a whiteout name when it uses the
whiteout, but the current implementation does not check
the whileout name, so sometimes UFS writes over a wrong
whtieout. UFS *MUST* check the whiteout name to use a
corrent whiteout. This bug leads unionfs. panic.
This commit fixes this trouble.
Submitted by: Masanori Ozawa <ozawa@ongs.co.jp> (unionfs developer)
Reviewed by: tegge & rodrigc (mentor)
Approved by: rodrigc (mentor)
MFC after: 2 weeks
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ufs/ufs_lookup.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index b420378..f59db65 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -700,7 +700,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp) struct buf *bp; u_int dsize; struct direct *ep, *nep; - int error, ret, blkoff, loc, spacefree, flags; + int error, ret, blkoff, loc, spacefree, flags, namlen; char *dirbuf; td = curthread; /* XXX */ @@ -875,8 +875,16 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp) * Update the pointer fields in the previous entry (if any), * copy in the new entry, and write out the block. */ +# if (BYTE_ORDER == LITTLE_ENDIAN) + if (OFSFMT(dvp)) + namlen = ep->d_type; + else + namlen = ep->d_namlen; +# else + namlen = ep->d_namlen; +# endif if (ep->d_ino == 0 || - (ep->d_ino == WINO && + (ep->d_ino == WINO && namlen == dirp->d_namlen && bcmp(ep->d_name, dirp->d_name, dirp->d_namlen) == 0)) { if (spacefree + dsize < newentrysize) panic("ufs_direnter: compact1"); |
