X-Git-Url: https://git.saurik.com/apple/hfs.git/blobdiff_plain/635a1ee066c8d1408a70ce4ba5f29ae03b0a5b78..e74bfeef39406b1d74075ba0ce340588618ea58d:/hfs_util/hfsutil_jnl.c diff --git a/hfs_util/hfsutil_jnl.c b/hfs_util/hfsutil_jnl.c index 931fb74..f83536d 100644 --- a/hfs_util/hfsutil_jnl.c +++ b/hfs_util/hfsutil_jnl.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -120,28 +121,209 @@ int hide_file(const char * file) return (result == -1 ? errno : result); } -int -get_start_block(const char *file) +off_t +get_start_block(const char *file, uint32_t fs_block_size) { - struct attrlist alist = {0}; - ExtentsAttrBuf extentsbuf = {0}; + off_t cur_pos, phys_start, len; + int fd, err; + struct log2phys l2p; + struct stat st; - alist.bitmapcount = ATTR_BIT_MAP_COUNT; - alist.fileattr = ATTR_FILE_DATAEXTENTS; + fd = open(file, O_RDONLY); + if (fd < 0) { + return -1; + } - if (getattrlist(file, &alist, &extentsbuf, sizeof(extentsbuf), 0)) { - fprintf(stderr, "could not get attrlist for %s (%s)", file, strerror(errno)); + if (fstat(fd, &st) < 0) { + fprintf(stderr, "can't stat %s (%s)\n", file, strerror(errno)); + close(fd); return -1; } - if (extentsbuf.extents[1].startBlock != 0) { - fprintf(stderr, "Journal File not contiguous!\n"); + fs_block_size = st.st_blksize; // XXXdbg quick hack for now + + phys_start = len = 0; + for(cur_pos=0; cur_pos < st.st_size; cur_pos += fs_block_size) { + memset(&l2p, 0, sizeof(l2p)); + lseek(fd, cur_pos, SEEK_SET); + err = fcntl(fd, F_LOG2PHYS, &l2p); + + if (phys_start == 0) { + phys_start = l2p.l2p_devoffset; + len = fs_block_size; + } else if (l2p.l2p_devoffset != (phys_start + len)) { + // printf(" %lld : %lld - %lld\n", cur_pos, phys_start / fs_block_size, len / fs_block_size); + fprintf(stderr, "%s : is not contiguous!\n", file); + close(fd); + return -1; + // phys_start = l2p.l2p_devoffset; + // len = fs_block_size; + } else { + len += fs_block_size; + } + } + + close(fd); + + //printf("%s start offset %lld; byte len %lld (blksize %d)\n", + // file, phys_start, len, fs_block_size); + + if ((phys_start / (unsigned)fs_block_size) & 0xffffffff00000000LL) { + fprintf(stderr, "%s : starting block is > 32bits!\n", file); return -1; } + + return phys_start; +} + + +// +// Get the embedded offset (if any) for an hfs+ volume. +// This is pretty skanky that we have to do this but +// that's life... +// +#include +#include + +#include + +#define HFS_PRI_SECTOR(blksize) (1024 / (blksize)) +#define HFS_PRI_OFFSET(blksize) ((blksize) > 1024 ? 1024 : 0) - return extentsbuf.extents[0].startBlock; +#define SWAP_BE16(x) ntohs(x) +#define SWAP_BE32(x) ntohl(x) + + +off_t +get_embedded_offset(char *devname) +{ + int fd = -1; + off_t ret = 0; + char *buff = NULL, rawdev[256]; + u_int64_t blkcnt; + u_int32_t blksize; + HFSMasterDirectoryBlock *mdbp; + off_t embeddedOffset; + struct statfs sfs; + struct stat st; + + restart: + if (stat(devname, &st) != 0) { + fprintf(stderr, "Could not access %s (%s)\n", devname, strerror(errno)); + ret = -1; + goto out; + } + + if (S_ISCHR(st.st_mode) == 0) { + // hmmm, it's not the character special raw device so we + // should try to figure out the real device. + if (statfs(devname, &sfs) != 0) { + fprintf(stderr, "Can't find out any info about the fs for path %s (%s)\n", + devname, strerror(errno)); + ret = -1; + goto out; + } + + // copy the "/dev/" + strncpy(rawdev, sfs.f_mntfromname, 5); + rawdev[5] = 'r'; + strcpy(&rawdev[6], &sfs.f_mntfromname[5]); + devname = &rawdev[0]; + goto restart; + } + + fd = open(devname, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "can't open: %s (%s)\n", devname, strerror(errno)); + ret = -1; + goto out; + } + + /* Get the real physical block size. */ + if (ioctl(fd, DKIOCGETBLOCKSIZE, (caddr_t)&blksize) != 0) { + fprintf(stderr, "can't get the device block size (%s). assuming 512\n", strerror(errno)); + blksize = 512; + ret = -1; + goto out; + } + + /* Get the number of physical blocks. */ + if (ioctl(fd, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt)) { + struct stat st; + fprintf(stderr, "failed to get block count. trying stat().\n"); + if (fstat(fd, &st) != 0) { + ret = -1; + goto out; + } + + blkcnt = st.st_size / blksize; + } + + /* + * At this point: + * blksize has our prefered physical block size + * blkcnt has the total number of physical blocks + */ + + buff = (char *)malloc(blksize); + + if (pread(fd, buff, blksize, HFS_PRI_SECTOR(blksize)*blksize) != blksize) { + fprintf(stderr, "failed to read volume header @ offset %d (%s)\n", + HFS_PRI_SECTOR(blksize), strerror(errno)); + ret = -1; + goto out; + } + + mdbp = (HFSMasterDirectoryBlock *)buff; + if ( (SWAP_BE16(mdbp->drSigWord) != kHFSSigWord) + && (SWAP_BE16(mdbp->drSigWord) != kHFSPlusSigWord) + && (SWAP_BE16(mdbp->drSigWord) != kHFSXSigWord)) { + ret = -1; + goto out; + } + + if ((SWAP_BE16(mdbp->drSigWord) == kHFSSigWord) && (SWAP_BE16(mdbp->drEmbedSigWord) != kHFSPlusSigWord)) { + ret = -1; + goto out; + } else if (SWAP_BE16(mdbp->drEmbedSigWord) == kHFSPlusSigWord) { + /* Get the embedded Volume Header */ + embeddedOffset = SWAP_BE16(mdbp->drAlBlSt) * 512; + embeddedOffset += (u_int64_t)SWAP_BE16(mdbp->drEmbedExtent.startBlock) * + (u_int64_t)SWAP_BE32(mdbp->drAlBlkSiz); + + /* + * If the embedded volume doesn't start on a block + * boundary, then switch the device to a 512-byte + * block size so everything will line up on a block + * boundary. + */ + if ((embeddedOffset % blksize) != 0) { + fprintf(stderr, "HFS Mount: embedded volume offset not" + " a multiple of physical block size (%d);" + " switching to 512\n", blksize); + + blkcnt *= (blksize / 512); + blksize = 512; + } + + } else { /* pure HFS+ */ + embeddedOffset = 0; + } + + ret = embeddedOffset; + + out: + if (buff) { + free(buff); + } + if (fd >= 0) + close(fd); + + return ret; } + + static const char *journal_fname = ".journal"; static const char *jib_fname = ".journal_info_block"; @@ -152,10 +334,12 @@ DoMakeJournaled(char *volname, int jsize) char *buf; int ret; fstore_t fst; - int jstart_block, jinfo_block, sysctl_info[8]; + int32_t jstart_block, jinfo_block; + int sysctl_info[8]; JournalInfoBlock jib; struct statfs sfs; static char tmpname[MAXPATHLEN]; + off_t start_block, embedded_offset; if (statfs(volname, &sfs) != 0) { fprintf(stderr, "Can't stat volume %s (%s).\n", volname, strerror(errno)); @@ -202,6 +386,15 @@ DoMakeJournaled(char *volname, int jsize) return 10; } + + embedded_offset = get_embedded_offset(volname); + if (embedded_offset < 0) { + fprintf(stderr, "Can't calculate the embedded offset (if any) for %s.\n", volname); + fprintf(stderr, "Journal creation failure.\n"); + return 15; + } + // printf("Embedded offset == 0x%llx\n", embedded_offset); + fd = open(journal_fname, O_CREAT|O_TRUNC|O_RDWR, 000); if (fd < 0) { fprintf(stderr, "Can't create journal file on volume %s (%s)\n", @@ -270,9 +463,16 @@ DoMakeJournaled(char *volname, int jsize) close(fd); hide_file(journal_fname); - jstart_block = get_start_block(journal_fname); + start_block = get_start_block(journal_fname, block_size); + if (start_block == (off_t)-1) { + fprintf(stderr, "Failed to get start block for %s (%s)\n", + journal_fname, strerror(errno)); + unlink(journal_fname); + return 20; + } + jstart_block = (start_block / block_size) - (embedded_offset / block_size); - memset(&jib, 0, sizeof(jib)); + memset(&jib, 'Z', sizeof(jib)); jib.flags = kJIJournalInFSMask; jib.offset = (off_t)((unsigned)jstart_block) * (off_t)((unsigned)block_size); jib.size = (off_t)((unsigned)journal_size); @@ -286,16 +486,16 @@ DoMakeJournaled(char *volname, int jsize) } // swap the data before we copy it - jib.flags = NXSwapBigLongToHost(jib.flags); - jib.offset = NXSwapBigLongLongToHost(jib.offset); - jib.size = NXSwapBigLongLongToHost(jib.size); + jib.flags = OSSwapBigToHostInt32(jib.flags); + jib.offset = OSSwapBigToHostInt64(jib.offset); + jib.size = OSSwapBigToHostInt64(jib.size); memcpy(buf, &jib, sizeof(jib)); // now put it back the way it was - jib.size = NXSwapBigLongLongToHost(jib.size); - jib.offset = NXSwapBigLongLongToHost(jib.offset); - jib.flags = NXSwapBigLongToHost(jib.flags); + jib.size = OSSwapBigToHostInt64(jib.size); + jib.offset = OSSwapBigToHostInt64(jib.offset); + jib.flags = OSSwapBigToHostInt32(jib.flags); if (write(fd, buf, block_size) != block_size) { fprintf(stderr, "Failed to write journal info block on volume %s (%s)!\n", @@ -308,7 +508,15 @@ DoMakeJournaled(char *volname, int jsize) close(fd); hide_file(jib_fname); - jinfo_block = get_start_block(jib_fname); + start_block = get_start_block(jib_fname, block_size); + if (start_block == (off_t)-1) { + fprintf(stderr, "Failed to get start block for %s (%s)\n", + jib_fname, strerror(errno)); + unlink(journal_fname); + unlink(jib_fname); + return 20; + } + jinfo_block = (start_block / block_size) - (embedded_offset / block_size); // @@ -440,3 +648,188 @@ DoGetJournalInfo(char *volname) return 0; } + + +int +RawDisableJournaling(char *devname) +{ + int fd = -1, ret = 0; + char *buff = NULL, rawdev[256]; + u_int64_t disksize; + u_int64_t blkcnt; + u_int32_t blksize; + daddr_t mdb_offset; + HFSMasterDirectoryBlock *mdbp; + HFSPlusVolumeHeader *vhp; + off_t embeddedOffset, hdr_offset; + struct statfs sfs; + struct stat st; + + restart: + if (stat(devname, &st) != 0) { + fprintf(stderr, "Could not access %s (%s)\n", devname, strerror(errno)); + ret = -1; + goto out; + } + + if (S_ISCHR(st.st_mode) == 0) { + // hmmm, it's not the character special raw device so we + // should try to figure out the real device. + if (S_ISBLK(st.st_mode)) { + strcpy(rawdev, "/dev/r"); + strcat(rawdev, devname + 5); + } else { + if (statfs(devname, &sfs) != 0) { + fprintf(stderr, "Can't find out any info about the fs for path %s (%s)\n", + devname, strerror(errno)); + ret = -1; + goto out; + } + + // copy the "/dev/" + strncpy(rawdev, sfs.f_mntfromname, 5); + rawdev[5] = 'r'; + strcpy(&rawdev[6], &sfs.f_mntfromname[5]); + } + + devname = &rawdev[0]; + goto restart; + } + + fd = open(devname, O_RDWR); + if (fd < 0) { + fprintf(stderr, "can't open: %s (%s)\n", devname, strerror(errno)); + ret = -1; + goto out; + } + + /* Get the real physical block size. */ + if (ioctl(fd, DKIOCGETBLOCKSIZE, (caddr_t)&blksize) != 0) { + fprintf(stderr, "can't get the device block size (%s). assuming 512\n", strerror(errno)); + blksize = 512; + ret = -1; + goto out; + } + + /* Get the number of physical blocks. */ + if (ioctl(fd, DKIOCGETBLOCKCOUNT, (caddr_t)&blkcnt)) { + struct stat st; + + if (fstat(fd, &st) != 0) { + ret = -1; + goto out; + } + + blkcnt = st.st_size / blksize; + } + + /* Compute an accurate disk size */ + disksize = blkcnt * (u_int64_t)blksize; + + /* + * There are only 31 bits worth of block count in + * the buffer cache. So for large volumes a 4K + * physical block size is needed. + */ + if (blksize == 512 && blkcnt > (u_int64_t)0x000000007fffffff) { + blksize = 4096; + } + + /* + * At this point: + * blksize has our prefered physical block size + * blkcnt has the total number of physical blocks + */ + + buff = (char *)malloc(blksize); + + hdr_offset = HFS_PRI_SECTOR(blksize)*blksize; + if (pread(fd, buff, blksize, hdr_offset) != blksize) { + fprintf(stderr, "failed to read volume header @ offset %lld (%s)\n", + hdr_offset, strerror(errno)); + ret = -1; + goto out; + } + + // if we read in an empty bunch of junk at location zero, then + // retry at offset 0x400 which is where the header normally is. + if (*(int *)buff == 0 && hdr_offset == 0) { + hdr_offset = 0x400; + if (pread(fd, buff, blksize, hdr_offset) != blksize) { + fprintf(stderr, "failed to read volume header @ offset %lld (%s)\n", + hdr_offset, strerror(errno)); + ret = -1; + goto out; + } + } + + + + mdbp = (HFSMasterDirectoryBlock *)buff; + if ((SWAP_BE16(mdbp->drSigWord) == kHFSSigWord) && (SWAP_BE16(mdbp->drEmbedSigWord) != kHFSPlusSigWord)) { + // normal hfs can not ever be journaled + fprintf(stderr, "disable_journaling: volume is only regular HFS, not HFS+\n"); + goto out; + } + + /* Get the embedded Volume Header */ + if (SWAP_BE16(mdbp->drEmbedSigWord) == kHFSPlusSigWord) { + embeddedOffset = SWAP_BE16(mdbp->drAlBlSt) * 512; + embeddedOffset += (u_int64_t)SWAP_BE16(mdbp->drEmbedExtent.startBlock) * (u_int64_t)SWAP_BE32(mdbp->drAlBlkSiz); + + /* + * If the embedded volume doesn't start on a block + * boundary, then switch the device to a 512-byte + * block size so everything will line up on a block + * boundary. + */ + if ((embeddedOffset % blksize) != 0) { + fprintf(stderr, "HFS Mount: embedded volume offset not" + " a multiple of physical block size (%d);" + " switching to 512\n", blksize); + + blkcnt *= (blksize / 512); + blksize = 512; + } + + disksize = (u_int64_t)SWAP_BE16(mdbp->drEmbedExtent.blockCount) * (u_int64_t)SWAP_BE32(mdbp->drAlBlkSiz); + + mdb_offset = (embeddedOffset / blksize) + HFS_PRI_SECTOR(blksize); + hdr_offset = mdb_offset * blksize; + if (pread(fd, buff, blksize, hdr_offset) != blksize) { + fprintf(stderr, "failed to read the embedded vhp @ offset %d\n", mdb_offset * blksize); + ret = -1; + goto out; + } + + vhp = (HFSPlusVolumeHeader*) buff; + } else /* pure HFS+ */ { + embeddedOffset = 0; + vhp = (HFSPlusVolumeHeader*) mdbp; + } + + + if ((SWAP_BE32(vhp->attributes) & kHFSVolumeJournaledMask) != 0) { + unsigned int tmp = SWAP_BE32(vhp->attributes); + + tmp &= ~kHFSVolumeJournaledMask; + vhp->attributes = SWAP_BE32(tmp); + if ((tmp = pwrite(fd, buff, blksize, hdr_offset)) != blksize) { + fprintf(stderr, "Update of super-block on %s failed! (%d != %d, %s)\n", + devname, tmp, blksize, strerror(errno)); + } else { + fprintf(stderr, "Turned off the journaling bit for %s\n", devname); + } + } else { + fprintf(stderr, "disable_journaling: volume was not journaled.\n"); + } + + + out: + if (buff) + free(buff); + if (fd >= 0) + close(fd); + + return ret; +}