From eb938bd18d9806f3529b7a2cbccdce5340c0e39f Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 14 Dec 2012 15:05:53 -0600 Subject: [PATCH] volser: Check vnode length on dump Commit aadf69eabb1962496fa93745ab560a5b48cacd61 adds length checks on vnodes during fileserver read/write operations. Do the same thing when we dump volume data from the volserver, to ensure that we don't transmit incorrect data e.g. to other RO sites when releasing. FIXES 131530 Change-Id: I662489d0466d38af74a9604a2c97a4a5c72525c7 Reviewed-on: http://gerrit.openafs.org/8836 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/volser/dumpstuff.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index bcb2c84de2..3945d44837 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -1080,6 +1080,7 @@ DumpVnode(struct iod *iodp, struct VnodeDiskObject *v, int volid, VAclDiskSize(v)); } if (VNDISK_GET_INO(v)) { + afs_sfsize_t indexlen, disklen; IH_INIT(ihP, iodp->device, iodp->parentId, VNDISK_GET_INO(v)); fdP = IH_OPEN(ihP); if (fdP == NULL) { @@ -1087,6 +1088,17 @@ DumpVnode(struct iod *iodp, struct VnodeDiskObject *v, int volid, IH_RELEASE(ihP); return VOLSERREAD_DUMPERROR; } + VNDISK_GET_LEN(indexlen, v); + disklen = FDH_SIZE(fdP); + if (indexlen != disklen) { + FDH_REALLYCLOSE(fdP); + IH_RELEASE(ihP); + Log("DumpVnode: volume %lu vnode %lu has inconsistent length " + "(index %lu disk %lu); aborting dump\n", + (unsigned long)volid, (unsigned long)vnodeNumber, + (unsigned long)indexlen, (unsigned long)disklen); + return VOLSERREAD_DUMPERROR; + } code = DumpFile(iodp, vnodeNumber, fdP); FDH_CLOSE(fdP); IH_RELEASE(ihP);