/*
- * Copyright (c) 1997-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1997-2010 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
*
* @(#)hfs_search.c
*/
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections. This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/utfconv.h>
#include <sys/kauth.h>
#include <sys/vnode_internal.h>
+#include <sys/mount_internal.h>
+
+#if CONFIG_MACF
+#include <security/mac_framework.h>
+#endif
#include "hfs.h"
#include "hfs_dbg.h"
struct searchinfospec
{
u_char name[kHFSPlusMaxFileNameBytes];
- u_long nameLength;
+ u_int32_t nameLength;
char attributes; // see IM:Files 2-100
- u_long nodeID;
- u_long parentDirID;
+ u_int32_t nodeID;
+ u_int32_t parentDirID;
struct timespec creationDate;
struct timespec modificationDate;
struct timespec changeDate;
struct timespec accessDate;
struct timespec lastBackupDate;
- uint8_t finderInfo[32];
+ u_int8_t finderInfo[32];
uid_t uid;
gid_t gid;
mode_t mask;
};
typedef struct searchinfospec searchinfospec_t;
-static void ResolveHardlink(ExtendedVCB *vcb, HFSPlusCatalogFile *recp);
+static void ResolveHardlink(struct hfsmount *hfsmp, HFSPlusCatalogFile *recp);
static int UnpackSearchAttributeBlock(struct hfsmount *hfsmp, struct attrlist *alist,
- searchinfospec_t *searchInfo, void *attributeBuffer);
+ searchinfospec_t *searchInfo, void *attributeBuffer, int firstblock);
static int CheckCriteria( ExtendedVCB *vcb,
u_long searchBits,
CatalogRecord *rec,
CatalogKey *key,
searchinfospec_t *searchInfo1,
- searchinfospec_t *searchInfo2,
- Boolean lookForDup );
+ searchinfospec_t *searchInfo2 );
static int CheckAccess(ExtendedVCB *vcb, u_long searchBits, CatalogKey *key, struct vfs_context *ctx);
static int InsertMatch(struct hfsmount *hfsmp, uio_t a_uio, CatalogRecord *rec,
CatalogKey *key, struct attrlist *returnAttrList,
void *attributesBuffer, void *variableBuffer,
- u_long * nummatches );
+ uint32_t * nummatches );
static Boolean CompareRange(u_long val, u_long low, u_long high);
static Boolean CompareWideRange(u_int64_t val, u_int64_t low, u_int64_t high);
}
//#define CompareRange(val, low, high) ((val >= low) && (val <= high))
-#if 1 // Installer workaround (2940423)
-static Boolean IsTargetName( searchinfospec_t * searchInfoPtr, Boolean isHFSPlus );
-#endif // Installer workaround
-
-__private_extern__ int hfs_vnop_search(struct vnop_searchfs_args *ap);
-
/************************************************************************/
/* Entry for searchfs() */
};
*/
-__private_extern__
int
hfs_vnop_search(ap)
struct vnop_searchfs_args *ap; /*
FCB * catalogFCB;
searchinfospec_t searchInfo1;
searchinfospec_t searchInfo2;
- void *attributesBuffer;
+ void *attributesBuffer = NULL;
void *variableBuffer;
- u_long fixedBlockSize;
- u_long eachReturnBufferSize;
- struct proc *p = proc_self();
+ u_int32_t fixedBlockSize;
+ u_int32_t eachReturnBufferSize;
+ struct proc *p = current_proc();
int err = E_NONE;
int isHFSPlus;
- int timerExpired = false;
- int doQuickExit = false;
CatalogKey * myCurrentKeyPtr;
CatalogRecord * myCurrentDataPtr;
CatPosition * myCatPositionPtr;
user_size_t user_len = 0;
int32_t searchTime;
int lockflags;
+ struct uthread *ut;
+ boolean_t timerExpired = FALSE;
+ boolean_t needThrottle = FALSE;
/* XXX Parameter check a_searchattrs? */
if (ap->a_options & ~SRCHFS_VALIDOPTIONSMASK)
return (EINVAL);
+ /*
+ * Reject requests for unsupported attributes.
+ */
+ if ((ap->a_returnattrs->commonattr & ~HFS_ATTR_CMN_VALID) ||
+ (ap->a_returnattrs->volattr != 0) ||
+ (ap->a_returnattrs->dirattr & ~HFS_ATTR_DIR_VALID) ||
+ (ap->a_returnattrs->fileattr & ~HFS_ATTR_FILE_VALID) ||
+ (ap->a_returnattrs->forkattr != 0)) {
+ return (EINVAL);
+ }
+
/* SRCHFS_SKIPLINKS requires root access.
* This option cannot be used with either
* the ATTR_CMN_NAME or ATTR_CMN_PAROBJID
return (err);
}
+ // If both 32-bit and 64-bit parent ids or file ids are given
+ // then return an error.
+
+ attrgroup_t test_attrs=ap->a_searchattrs->commonattr;
+
+ if (((test_attrs & ATTR_CMN_OBJID) && (test_attrs & ATTR_CMN_FILEID)) ||
+ ((test_attrs & ATTR_CMN_PARENTID) && (test_attrs & ATTR_CMN_PAROBJID)))
+ return (EINVAL);
+
+
if (uio_resid(ap->a_uio) <= 0)
return (EINVAL);
/* UnPack the search boundries, searchInfo1, searchInfo2 */
err = UnpackSearchAttributeBlock(hfsmp, ap->a_searchattrs,
- &searchInfo1, ap->a_searchparams1);
+ &searchInfo1, ap->a_searchparams1, 1);
if (err) return err;
err = UnpackSearchAttributeBlock(hfsmp, ap->a_searchattrs,
- &searchInfo2, ap->a_searchparams2);
+ &searchInfo2, ap->a_searchparams2, 0);
if (err) return err;
- fixedBlockSize = sizeof(uint32_t) + hfs_attrblksize(ap->a_returnattrs); /* uint32_t for length word */
+ //shadow search bits if 64-bit file/parent ids are used
+ if (ap->a_searchattrs->commonattr & ATTR_CMN_FILEID)
+ ap->a_searchattrs->commonattr |= ATTR_CMN_OBJID;
+ if (ap->a_searchattrs->commonattr & ATTR_CMN_PARENTID)
+ ap->a_searchattrs->commonattr |= ATTR_CMN_PAROBJID;
+
+ fixedBlockSize = sizeof(u_int32_t) + hfs_attrblksize(ap->a_returnattrs); /* u_int32_t for length word */
eachReturnBufferSize = fixedBlockSize;
eachReturnBufferSize += kHFSPlusMaxFileNameBytes + 1;
MALLOC( attributesBuffer, void *, eachReturnBufferSize, M_TEMP, M_WAITOK );
+ if (attributesBuffer == NULL) {
+ err = ENOMEM;
+ goto ExitThisRoutine;
+ }
variableBuffer = (void*)((char*) attributesBuffer + fixedBlockSize);
// XXXdbg - have to lock the user's buffer so we don't fault
(void) hfs_fsync(vcb->catalogRefNum, MNT_WAIT, 0, p);
if (hfsmp->jnl) {
hfs_systemfile_unlock(hfsmp, lockflags);
- journal_flush(hfsmp->jnl);
+ hfs_journal_flush(hfsmp, FALSE);
lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
}
ap->a_options &= ~SRCHFS_START;
- bzero( (caddr_t)myCatPositionPtr, sizeof( *myCatPositionPtr ) );
+ bzero((caddr_t)myCatPositionPtr, sizeof(*myCatPositionPtr));
err = BTScanInitialize(catalogFCB, 0, 0, 0, kCatSearchBufferSize, &myBTScanState);
-
-#if 1 // Installer workaround (2940423)
- // hack to get around installer problems when the installer expects search results
- // to be in key order. At this point the problem appears to be limited to
- // searches for "Library". The idea here is to go get the "Library" at root
- // and return it first to the caller then continue the search as normal with
- // the exception of taking care not to return a duplicate hit (see CheckCriteria)
- if ( err == E_NONE &&
- (ap->a_searchattrs->commonattr & ATTR_CMN_NAME) != 0 &&
- IsTargetName( &searchInfo1, isHFSPlus ) )
- {
- CatalogRecord rec;
- BTreeIterator iterator;
- FSBufferDescriptor btrec;
- CatalogKey * keyp;
- UInt16 reclen;
- OSErr result;
-
- bzero( (caddr_t)&iterator, sizeof( iterator ) );
- keyp = (CatalogKey *) &iterator.key;
- (void) BuildCatalogKeyUTF8(vcb, kRootDirID, "Library", kUndefinedStrLen, keyp, NULL);
-
- btrec.bufferAddress = &rec;
- btrec.itemCount = 1;
- btrec.itemSize = sizeof( rec );
-
- result = BTSearchRecord( catalogFCB, &iterator, &btrec, &reclen, &iterator );
- if ( result == E_NONE ) {
- // need to unlock since CheckAccess assumes no lock held
- hfs_systemfile_unlock(hfsmp, lockflags);
- if (CheckCriteria(vcb, ap->a_options, ap->a_searchattrs, &rec,
- keyp, &searchInfo1, &searchInfo2, false) &&
- CheckAccess(vcb, ap->a_options, keyp, ap->a_context)) {
-
- result = InsertMatch(hfsmp, ap->a_uio, &rec,
- keyp, ap->a_returnattrs,
- attributesBuffer, variableBuffer,
- ap->a_nummatches);
- if (result == E_NONE && *(ap->a_nummatches) >= ap->a_maxmatches)
- doQuickExit = true;
- }
- lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
- }
+ if (err) {
+ goto ExitThisRoutine;
}
-#endif // Installer workaround
} else {
/* Resuming a search. */
err = BTScanInitialize(catalogFCB, myCatPositionPtr->nextNode,
if (err)
goto ExitThisRoutine;
-#if 1 // Installer workaround (2940423)
- if ( doQuickExit )
- goto QuickExit;
-#endif // Installer workaround
+ if (throttle_get_io_policy(&ut) == IOPOL_THROTTLE)
+ needThrottle = TRUE;
/*
* Check all the catalog btree records...
* return the attributes for matching items
/* Resolve any hardlinks */
if (isHFSPlus && (ap->a_options & SRCHFS_SKIPLINKS) == 0) {
- lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
- ResolveHardlink(vcb, (HFSPlusCatalogFile *) myCurrentDataPtr);
- hfs_systemfile_unlock(hfsmp, lockflags);
+ ResolveHardlink(vcb, (HFSPlusCatalogFile *)myCurrentDataPtr);
}
if (CheckCriteria( vcb, ap->a_options, ap->a_searchattrs, myCurrentDataPtr,
- myCurrentKeyPtr, &searchInfo1, &searchInfo2, true )
+ myCurrentKeyPtr, &searchInfo1, &searchInfo2 )
&& CheckAccess(vcb, ap->a_options, myCurrentKeyPtr, ap->a_context)) {
err = InsertMatch(hfsmp, ap->a_uio, myCurrentDataPtr,
myCurrentKeyPtr, ap->a_returnattrs,
if (*(ap->a_nummatches) >= ap->a_maxmatches)
break;
}
-
- /*
- * Check our elapsed time and bail if we've hit the max.
- * The idea here is to throttle the amount of time we
- * spend in the kernel.
- */
- microuptime(&myCurrentTime);
- timersub(&myCurrentTime, &myBTScanState.startTime, &myElapsedTime);
- /* Note: assumes kMaxMicroSecsInKernel is less than 1,000,000 */
- if (myElapsedTime.tv_sec > 0
- || myElapsedTime.tv_usec >= searchTime) {
- timerExpired = true;
+ if (timerExpired == FALSE) {
+ /*
+ * Check our elapsed time and bail if we've hit the max.
+ * The idea here is to throttle the amount of time we
+ * spend in the kernel.
+ */
+ microuptime(&myCurrentTime);
+ timersub(&myCurrentTime, &myBTScanState.startTime, &myElapsedTime);
+ /*
+ * Note: assumes kMaxMicroSecsInKernel is less than 1,000,000
+ */
+ if (myElapsedTime.tv_sec > 0
+ || myElapsedTime.tv_usec >= searchTime) {
+ timerExpired = TRUE;
+ } else if (needThrottle == TRUE) {
+ if (throttle_io_will_be_throttled(ut->uu_lowpri_window, HFSTOVFS(hfsmp)))
+ timerExpired = TRUE;
+ }
}
}
-QuickExit:
/* Update catalog position */
myCatPositionPtr->writeCount = myBTScanState.btcb->writeCount;
}
ExitThisRoutine:
- FREE( attributesBuffer, M_TEMP );
+ if (attributesBuffer)
+ FREE(attributesBuffer, M_TEMP);
if (hfsmp->jnl && user_start) {
vsunlock(user_start, user_len, TRUE);
static void
-ResolveHardlink(ExtendedVCB *vcb, HFSPlusCatalogFile *recp)
+ResolveHardlink(struct hfsmount *hfsmp, HFSPlusCatalogFile *recp)
{
- if ((recp->recordType == kHFSPlusFileRecord)
- && (SWAP_BE32(recp->userInfo.fdType) == kHardLinkFileType)
- && (SWAP_BE32(recp->userInfo.fdCreator) == kHFSPlusCreator)
- && ((to_bsd_time(recp->createDate) == vcb->vcbCrDate) ||
- (to_bsd_time(recp->createDate) == VCBTOHFS(vcb)->hfs_metadata_createdate))) {
+ u_int32_t type, creator;
+ int isdirlink = 0;
+ int isfilelink = 0;
+ time_t filecreatedate;
+
+ if (recp->recordType != kHFSPlusFileRecord) {
+ return;
+ }
+ type = SWAP_BE32(recp->userInfo.fdType);
+ creator = SWAP_BE32(recp->userInfo.fdCreator);
+ filecreatedate = to_bsd_time(recp->createDate);
+
+ if ((type == kHardLinkFileType && creator == kHFSPlusCreator) &&
+ (filecreatedate == (time_t)hfsmp->hfs_itime ||
+ filecreatedate == (time_t)hfsmp->hfs_metadata_createdate)) {
+ isfilelink = 1;
+ } else if ((type == kHFSAliasType && creator == kHFSAliasCreator) &&
+ (recp->flags & kHFSHasLinkChainMask) &&
+ (filecreatedate == (time_t)hfsmp->hfs_itime ||
+ filecreatedate == (time_t)hfsmp->hfs_metadata_createdate)) {
+ isdirlink = 1;
+ }
+
+ if (isfilelink || isdirlink) {
cnid_t saved_cnid;
+ int lockflags;
/* Export link's cnid (a unique value) instead of inode's cnid */
saved_cnid = recp->fileID;
- (void) resolvelink(VCBTOHFS(vcb), recp->bsdInfo.special.iNodeNum, recp);
+ lockflags = hfs_systemfile_lock(hfsmp, SFL_CATALOG, HFS_SHARED_LOCK);
+
+ (void) cat_resolvelink(hfsmp, recp->hl_linkReference, isdirlink, recp);
+
recp->fileID = saved_cnid;
+ hfs_systemfile_unlock(hfsmp, lockflags);
}
}
static Boolean
-CompareMasked(const UInt32 *thisValue, const UInt32 *compareData,
- const UInt32 *compareMask, UInt32 count)
+CompareMasked(const u_int32_t *thisValue, const u_int32_t *compareData,
+ const u_int32_t *compareMask, u_int32_t count)
{
Boolean matched;
- UInt32 i;
+ u_int32_t i;
matched = true; /* Assume it will all match */
}
-//
-// Determine if a name is "inappropriate" where the definition
-// of "inappropriate" is up to higher level execs. Currently
-// that's limited to /System.
-//
-static int
-is_inappropriate_name(char *name, int len)
-{
- const char *bad_names[] = { "System" };
- int bad_len[] = { 6 };
- int i;
-
- for(i=0; i < (int) (sizeof(bad_names) / sizeof(bad_names[0])); i++) {
- if (len == bad_len[i] && strcmp(name, bad_names[i]) == 0) {
- return 1;
- }
- }
-
- // if we get here, no name matched
- return 0;
-}
-
-
-
/*
* Check to see if caller has access rights to this item
*/
cnode_t * cp;
/* now go get catalog data for this directory */
- myErr = hfs_vget(hfsmp, myNodeID, &vp, 0);
+ myErr = hfs_vget(hfsmp, myNodeID, &vp, 0, 0);
if ( myErr ) {
goto ExitThisRoutine; /* no access */
}
if ( searchBits & SRCHFS_SKIPPACKAGES ) {
if ( (SWAP_BE16(finfop->frFlags) & kHasBundle)
|| (cp->c_desc.cd_nameptr != NULL
- && is_package_name(cp->c_desc.cd_nameptr, cp->c_desc.cd_namelen)) ) {
+ && is_package_name((const char *)cp->c_desc.cd_nameptr, cp->c_desc.cd_namelen)) ) {
myResult = 0;
goto ExitThisRoutine;
}
if ( searchBits & SRCHFS_SKIPINAPPROPRIATE ) {
if ( cp->c_parentcnid == kRootDirID && cp->c_desc.cd_nameptr != NULL &&
- is_inappropriate_name(cp->c_desc.cd_nameptr, cp->c_desc.cd_namelen) ) {
+ vn_searchfs_inappropriate_name((const char *)cp->c_desc.cd_nameptr, cp->c_desc.cd_namelen) ) {
myResult = 0;
goto ExitThisRoutine;
}
myNodeID = cp->c_parentcnid; /* move up the hierarchy */
hfs_unlock(VTOC(vp));
+
+#if CONFIG_MACF
+ if (vp->v_type == VDIR) {
+ myErr = mac_vnode_check_readdir(ctx, vp);
+ } else {
+ myErr = mac_vnode_check_stat(ctx, NOCRED, vp);
+ }
+ if (myErr) {
+ vnode_put(vp);
+ vp = NULL;
+ goto ExitThisRoutine;
+ }
+#endif /* MAC */
+
if (vp->v_type == VDIR) {
myErr = vnode_authorize(vp, NULL, (KAUTH_VNODE_SEARCH | KAUTH_VNODE_LIST_DIRECTORY), ctx);
} else {
CatalogRecord *rec,
CatalogKey *key,
searchinfospec_t *searchInfo1,
- searchinfospec_t *searchInfo2,
- Boolean lookForDup )
+ searchinfospec_t *searchInfo2 )
{
Boolean matched, atleastone;
Boolean isHFSPlus;
if ((SWAP_BE32(filep->userInfo.fdType) == kHardLinkFileType) &&
(SWAP_BE32(filep->userInfo.fdCreator) == kHFSPlusCreator)) {
- return (false); /* skip over link records */
- } else if ((parid == VCBTOHFS(vcb)->hfs_privdir_desc.cd_cnid) &&
+ return (false); /* skip over file link records */
+ } else if ((parid == vcb->hfs_private_desc[FILE_HARDLINKS].cd_cnid) &&
(filep->bsdInfo.special.linkCount == 0)) {
return (false); /* skip over unlinked files */
+ } else if ((SWAP_BE32(filep->userInfo.fdType) == kHFSAliasType) &&
+ (SWAP_BE32(filep->userInfo.fdCreator) == kHFSAliasCreator) &&
+ (filep->flags & kHFSHasLinkChainMask)) {
+ return (false); /* skip over dir link records */
}
- } else if (key->hfsPlus.parentID == VCBTOHFS(vcb)->hfs_privdir_desc.cd_cnid) {
+ } else if (key->hfsPlus.parentID == vcb->hfs_private_desc[FILE_HARDLINKS].cd_cnid) {
+ return (false); /* skip over private files */
+ } else if (key->hfsPlus.parentID == vcb->hfs_private_desc[DIR_HARDLINKS].cd_cnid) {
return (false); /* skip over private files */
}
matched = (FastRelString(key->hfs.nodeName, (u_char*)searchInfo1->name) == 0);
}
-#if 1 // Installer workaround (2940423)
- if ( lookForDup ) {
- HFSCatalogNodeID parentID;
- if (isHFSPlus)
- parentID = key->hfsPlus.parentID;
- else
- parentID = key->hfs.parentID;
-
- if ( matched && parentID == kRootDirID &&
- IsTargetName( searchInfo1, isHFSPlus ) )
- matched = false;
- }
-#endif // Installer workaround
-
if ( matched == false || (searchBits & ~SRCHFS_MATCHPARTIALNAMES) == 0 )
goto TestDone; /* no match, or nothing more to compare */
}
else if ((attrList->fileattr & ATTR_FILE_VALIDMASK) != 0) {
searchAttributes = attrList->fileattr;
-
+
+#if HFS_COMPRESSION
+ if ( c_attr.ca_flags & UF_COMPRESSED ) {
+ /* for compressed files, set the data length to the uncompressed data size */
+ if (( searchAttributes & ATTR_FILE_DATALENGTH ) ||
+ ( searchAttributes & ATTR_FILE_DATAALLOCSIZE ) ) {
+ if ( 0 == hfs_uncompressed_size_of_compressed_file(vcb, NULL, c_attr.ca_fileid, &datafork.cf_size, 1) ) { /* 1 == don't take the cnode lock */
+ datafork.cf_blocks = rsrcfork.cf_blocks;
+ }
+ }
+ /* treat compressed files as if their resource fork is empty */
+ if (( searchAttributes & ATTR_FILE_RSRCLENGTH ) ||
+ ( searchAttributes & ATTR_FILE_RSRCALLOCSIZE ) ) {
+ rsrcfork.cf_size = 0;
+ rsrcfork.cf_blocks = 0;
+ }
+ }
+#endif /* HFS_COMPRESSION */
+
/* File logical length (data fork) */
if ( searchAttributes & ATTR_FILE_DATALENGTH ) {
matched = CompareWideRange(
/* Finder Info & Extended Finder Info where extFinderInfo is last 32 bytes */
if ( searchAttributes & ATTR_CMN_FNDRINFO ) {
- UInt32 *thisValue;
- thisValue = (UInt32 *) &c_attr.ca_finderinfo;
+ u_int32_t *thisValue;
+ thisValue = (u_int32_t *) &c_attr.ca_finderinfo;
/*
* Note: ioFlFndrInfo and ioDrUsrWds have the same offset in search info, so
* no need to test the object type here.
*/
matched = CompareMasked(thisValue,
- (UInt32 *)&searchInfo1->finderInfo,
- (UInt32 *) &searchInfo2->finderInfo, 8);
+ (u_int32_t *)&searchInfo1->finderInfo,
+ (u_int32_t *) &searchInfo2->finderInfo, 8);
if (matched == false) goto TestDone;
atleastone = true;
}
/* mode */
if ( searchAttributes & ATTR_CMN_ACCESSMASK ) {
- matched = CompareRange((uint32_t)c_attr.ca_mode,
- (uint32_t)searchInfo1->mask,
- (uint32_t)searchInfo2->mask);
+ matched = CompareRange((u_int32_t)c_attr.ca_mode,
+ (u_int32_t)searchInfo1->mask,
+ (u_int32_t)searchInfo2->mask);
if (matched == false) goto TestDone;
atleastone = true;
}
static int
InsertMatch(struct hfsmount *hfsmp, uio_t a_uio, CatalogRecord *rec,
CatalogKey *key, struct attrlist *returnAttrList,
- void *attributesBuffer, void *variableBuffer, u_long * nummatches)
+ void *attributesBuffer, void *variableBuffer, uint32_t * nummatches)
{
int err;
void *rovingAttributesBuffer;
void *rovingVariableBuffer;
- u_long packedBufferSize;
- u_long privateDir = hfsmp->hfs_privdir_desc.cd_cnid;
+ long packedBufferSize;
struct attrblock attrblk;
struct cat_desc c_desc;
struct cat_attr c_attr;
bzero(&c_desc, sizeof(c_desc));
bzero(&c_attr, sizeof(c_attr));
- rovingAttributesBuffer = (char*)attributesBuffer + sizeof(u_long); /* Reserve space for length field */
+ rovingAttributesBuffer = (char*)attributesBuffer + sizeof(u_int32_t); /* Reserve space for length field */
rovingVariableBuffer = variableBuffer;
/* Convert catalog record into cat_attr format. */
cat_convertattr(hfsmp, rec, &c_attr, &datafork, &rsrcfork);
- /* hide our private meta data directory */
- if ((privateDir != 0) && (c_attr.ca_fileid == privateDir)) {
+ /* Hide our private meta data directories */
+ if (c_attr.ca_fileid == hfsmp->hfs_private_desc[FILE_HARDLINKS].cd_cnid ||
+ c_attr.ca_fileid == hfsmp->hfs_private_desc[DIR_HARDLINKS].cd_cnid) {
err = 0;
goto exit;
}
attrblk.ab_varbufpp = &rovingVariableBuffer;
attrblk.ab_flags = 0;
attrblk.ab_blocksize = 0;
+ attrblk.ab_context = vfs_context_current();
- hfs_packattrblk(&attrblk, hfsmp, NULL, &c_desc, &c_attr, &datafork, &rsrcfork, current_proc());
+ hfs_packattrblk(&attrblk, hfsmp, NULL, &c_desc, &c_attr, &datafork, &rsrcfork, vfs_context_current());
packedBufferSize = (char*)rovingVariableBuffer - (char*)attributesBuffer;
(* nummatches)++;
- *((u_long *)attributesBuffer) = packedBufferSize; /* Store length of fixed + var block */
+ *((u_int32_t *)attributesBuffer) = packedBufferSize; /* Store length of fixed + var block */
err = uiomove( (caddr_t)attributesBuffer, packedBufferSize, a_uio ); /* XXX should be packedBufferSize */
exit:
static int
-UnpackSearchAttributeBlock( struct hfsmount *hfsmp, struct attrlist *alist, searchinfospec_t *searchInfo, void *attributeBuffer )
+UnpackSearchAttributeBlock( struct hfsmount *hfsmp, struct attrlist *alist,
+ searchinfospec_t *searchInfo, void *attributeBuffer, int firstblock)
{
attrgroup_t a;
- u_long bufferSize;
+ u_int32_t bufferSize;
boolean_t is_64_bit;
DBG_ASSERT(searchInfo != NULL);
is_64_bit = proc_is64bit(current_proc());
- bufferSize = *((uint32_t *)attributeBuffer);
+ bufferSize = *((u_int32_t *)attributeBuffer);
if (bufferSize == 0)
return (EINVAL); /* XXX -DJB is a buffer size of zero ever valid for searchfs? */
- ++((uint32_t *)attributeBuffer); /* advance past the size */
+ attributeBuffer = (u_int32_t *)attributeBuffer + 1; /* advance past the size */
/*
* UnPack common attributes
a = alist->commonattr;
if ( a != 0 ) {
if ( a & ATTR_CMN_NAME ) {
- char *s;
- u_int32_t len;
+ if (firstblock) {
+ /* Only use the attrreference_t for the first searchparams */
+ char *s;
+ u_int32_t len;
- s = (char*) attributeBuffer + ((attrreference_t *) attributeBuffer)->attr_dataoffset;
- len = ((attrreference_t *) attributeBuffer)->attr_length;
+ s = (char*) attributeBuffer + ((attrreference_t *) attributeBuffer)->attr_dataoffset;
+ len = ((attrreference_t *) attributeBuffer)->attr_length;
- if (len > sizeof(searchInfo->name))
- return (EINVAL);
+ if (len > sizeof(searchInfo->name))
+ return (EINVAL);
- if (hfsmp->hfs_flags & HFS_STANDARD) {
- /* Convert name to pascal string to match HFS B-Tree names */
+ if (hfsmp->hfs_flags & HFS_STANDARD) {
+ /* Convert name to pascal string to match HFS B-Tree names */
- if (len > 0) {
- if (utf8_to_hfs(HFSTOVCB(hfsmp), len-1, s, (u_char*)searchInfo->name) != 0)
- return (EINVAL);
+ if (len > 0) {
+ if (utf8_to_hfs(HFSTOVCB(hfsmp), len-1, (u_char *)s, (u_char*)searchInfo->name) != 0)
+ return (EINVAL);
- searchInfo->nameLength = searchInfo->name[0];
+ searchInfo->nameLength = searchInfo->name[0];
+ } else {
+ searchInfo->name[0] = searchInfo->nameLength = 0;
+ }
} else {
- searchInfo->name[0] = searchInfo->nameLength = 0;
+ size_t ucslen;
+ /* Convert name to Unicode to match HFS Plus B-Tree names */
+
+ if (len > 0) {
+ if (utf8_decodestr((u_int8_t *)s, len-1, (UniChar*)searchInfo->name, &ucslen,
+ sizeof(searchInfo->name), ':', UTF_DECOMPOSED | UTF_ESCAPE_ILLEGAL))
+ return (EINVAL);
+
+ searchInfo->nameLength = ucslen / sizeof(UniChar);
+ } else {
+ searchInfo->nameLength = 0;
+ }
}
- ++((attrreference_t *)attributeBuffer);
- } else {
- size_t ucslen;
- /* Convert name to Unicode to match HFS Plus B-Tree names */
-
- if (len > 0) {
- if (utf8_decodestr(s, len-1, (UniChar*)searchInfo->name, &ucslen,
- sizeof(searchInfo->name), ':', UTF_DECOMPOSED))
- return (EINVAL);
-
- searchInfo->nameLength = ucslen / sizeof(UniChar);
- } else {
- searchInfo->nameLength = 0;
- }
- ++((attrreference_t *)attributeBuffer);
}
+ attributeBuffer = (attrreference_t*) attributeBuffer +1;
}
if ( a & ATTR_CMN_OBJID ) {
searchInfo->nodeID = ((fsobj_id_t *) attributeBuffer)->fid_objno; /* ignore fid_generation */
- ++((fsobj_id_t *)attributeBuffer);
+ attributeBuffer = (fsobj_id_t *)attributeBuffer + 1;
}
if ( a & ATTR_CMN_PAROBJID ) {
- searchInfo->parentDirID = ((fsobj_id_t *) attributeBuffer)->fid_objno; /* ignore fid_generation */
- ++((fsobj_id_t *)attributeBuffer);
+ searchInfo->parentDirID = ((fsobj_id_t *) attributeBuffer)->fid_objno; /* ignore fid_generation */
+ attributeBuffer = (fsobj_id_t *)attributeBuffer + 1;
}
+
if ( a & ATTR_CMN_CRTIME ) {
if (is_64_bit) {
- struct user_timespec tmp;
- tmp = *((struct user_timespec *)attributeBuffer);
+ struct user64_timespec tmp;
+ tmp = *((struct user64_timespec *)attributeBuffer);
searchInfo->creationDate.tv_sec = (time_t)tmp.tv_sec;
searchInfo->creationDate.tv_nsec = tmp.tv_nsec;
- ++((struct user_timespec *)attributeBuffer);
+ attributeBuffer = (struct user64_timespec *)attributeBuffer + 1;
}
else {
- searchInfo->creationDate = *((struct timespec *)attributeBuffer);
- ++((struct timespec *)attributeBuffer);
+ struct user32_timespec tmp;
+ tmp = *((struct user32_timespec *)attributeBuffer);
+ searchInfo->creationDate.tv_sec = (time_t)tmp.tv_sec;
+ searchInfo->creationDate.tv_nsec = tmp.tv_nsec;
+ attributeBuffer = (struct user32_timespec *)attributeBuffer + 1;
}
}
if ( a & ATTR_CMN_MODTIME ) {
if (is_64_bit) {
- struct user_timespec tmp;
- tmp = *((struct user_timespec *)attributeBuffer);
+ struct user64_timespec tmp;
+ tmp = *((struct user64_timespec *)attributeBuffer);
searchInfo->modificationDate.tv_sec = (time_t)tmp.tv_sec;
searchInfo->modificationDate.tv_nsec = tmp.tv_nsec;
- ++((struct user_timespec *)attributeBuffer);
+ attributeBuffer = (struct user64_timespec *)attributeBuffer + 1;
}
else {
- searchInfo->modificationDate = *((struct timespec *)attributeBuffer);
- ++((struct timespec *)attributeBuffer);
+ struct user32_timespec tmp;
+ tmp = *((struct user32_timespec *)attributeBuffer);
+ searchInfo->modificationDate.tv_sec = (time_t)tmp.tv_sec;
+ searchInfo->modificationDate.tv_nsec = tmp.tv_nsec;
+ attributeBuffer = (struct user32_timespec *)attributeBuffer + 1;
}
}
if ( a & ATTR_CMN_CHGTIME ) {
if (is_64_bit) {
- struct user_timespec tmp;
- tmp = *((struct user_timespec *)attributeBuffer);
+ struct user64_timespec tmp;
+ tmp = *((struct user64_timespec *)attributeBuffer);
searchInfo->changeDate.tv_sec = (time_t)tmp.tv_sec;
searchInfo->changeDate.tv_nsec = tmp.tv_nsec;
- ++((struct user_timespec *)attributeBuffer);
+ attributeBuffer = (struct user64_timespec *)attributeBuffer + 1;
}
else {
- searchInfo->changeDate = *((struct timespec *)attributeBuffer);
- ++((struct timespec *)attributeBuffer);
+ struct user32_timespec tmp;
+ tmp = *((struct user32_timespec *)attributeBuffer);
+ searchInfo->changeDate.tv_sec = (time_t)tmp.tv_sec;
+ searchInfo->changeDate.tv_nsec = tmp.tv_nsec;
+ attributeBuffer = (struct user32_timespec *)attributeBuffer + 1;
}
}
if ( a & ATTR_CMN_ACCTIME ) {
if (is_64_bit) {
- struct user_timespec tmp;
- tmp = *((struct user_timespec *)attributeBuffer);
+ struct user64_timespec tmp;
+ tmp = *((struct user64_timespec *)attributeBuffer);
searchInfo->accessDate.tv_sec = (time_t)tmp.tv_sec;
searchInfo->accessDate.tv_nsec = tmp.tv_nsec;
- ++((struct user_timespec *)attributeBuffer);
+ attributeBuffer = (struct user64_timespec *)attributeBuffer + 1;
}
else {
- searchInfo->accessDate = *((struct timespec *)attributeBuffer);
- ++((struct timespec *)attributeBuffer);
+ struct user32_timespec tmp;
+ tmp = *((struct user32_timespec *)attributeBuffer);
+ searchInfo->accessDate.tv_sec = (time_t)tmp.tv_sec;
+ searchInfo->accessDate.tv_nsec = tmp.tv_nsec;
+ attributeBuffer = (struct user32_timespec *)attributeBuffer + 1;
}
}
if ( a & ATTR_CMN_BKUPTIME ) {
if (is_64_bit) {
- struct user_timespec tmp;
- tmp = *((struct user_timespec *)attributeBuffer);
+ struct user64_timespec tmp;
+ tmp = *((struct user64_timespec *)attributeBuffer);
searchInfo->lastBackupDate.tv_sec = (time_t)tmp.tv_sec;
searchInfo->lastBackupDate.tv_nsec = tmp.tv_nsec;
- ++((struct user_timespec *)attributeBuffer);
+ attributeBuffer = (struct user64_timespec *)attributeBuffer + 1;
}
else {
- searchInfo->lastBackupDate = *((struct timespec *)attributeBuffer);
- ++((struct timespec *)attributeBuffer);
+ struct user32_timespec tmp;
+ tmp = *((struct user32_timespec *)attributeBuffer);
+ searchInfo->lastBackupDate.tv_sec = (time_t)tmp.tv_sec;
+ searchInfo->lastBackupDate.tv_nsec = tmp.tv_nsec;
+ attributeBuffer = (struct user32_timespec *)attributeBuffer + 1;
}
}
if ( a & ATTR_CMN_FNDRINFO ) {
bcopy( attributeBuffer, searchInfo->finderInfo, sizeof(searchInfo->finderInfo) );
- (uint8_t *)attributeBuffer += 32;
+ attributeBuffer = (u_int8_t *)attributeBuffer + 32;
}
if ( a & ATTR_CMN_OWNERID ) {
searchInfo->uid = *((uid_t *)attributeBuffer);
- ++((uid_t *)attributeBuffer);
+ attributeBuffer = (uid_t *)attributeBuffer + 1;
}
if ( a & ATTR_CMN_GRPID ) {
searchInfo->gid = *((gid_t *)attributeBuffer);
- ++((gid_t *)attributeBuffer);
+ attributeBuffer = (gid_t *)attributeBuffer + 1;
}
if ( a & ATTR_CMN_ACCESSMASK ) {
searchInfo->mask = *((mode_t *)attributeBuffer);
- ++((mode_t *)attributeBuffer);
+ attributeBuffer = (mode_t *)attributeBuffer + 1;
+ }
+ if ( a & ATTR_CMN_FILEID ) {
+ searchInfo->nodeID = (u_int32_t)*((u_int64_t *) attributeBuffer);
+ attributeBuffer = (u_int64_t *)attributeBuffer + 1;
+ }
+ if ( a & ATTR_CMN_PARENTID ) {
+ searchInfo->parentDirID = (u_int32_t)*((u_int64_t *) attributeBuffer);
+ attributeBuffer = (u_int64_t *)attributeBuffer + 1;
}
}
if ( a != 0 ) {
if ( a & ATTR_DIR_ENTRYCOUNT ) {
searchInfo->d.numFiles = *((u_int32_t *)attributeBuffer);
- ++((u_int32_t *)attributeBuffer);
+ attributeBuffer = (u_int32_t *)attributeBuffer + 1;
}
}
if ( a != 0 ) {
if ( a & ATTR_FILE_DATALENGTH ) {
searchInfo->f.dataLogicalLength = *((off_t *)attributeBuffer);
- ++((off_t *)attributeBuffer);
+ attributeBuffer = (off_t *)attributeBuffer + 1;
}
if ( a & ATTR_FILE_DATAALLOCSIZE ) {
searchInfo->f.dataPhysicalLength = *((off_t *)attributeBuffer);
- ++((off_t *)attributeBuffer);
+ attributeBuffer = (off_t *)attributeBuffer + 1;
}
if ( a & ATTR_FILE_RSRCLENGTH ) {
searchInfo->f.resourceLogicalLength = *((off_t *)attributeBuffer);
- ++((off_t *)attributeBuffer);
+ attributeBuffer = (off_t *)attributeBuffer + 1;
}
if ( a & ATTR_FILE_RSRCALLOCSIZE ) {
searchInfo->f.resourcePhysicalLength = *((off_t *)attributeBuffer);
- ++((off_t *)attributeBuffer);
+ attributeBuffer = (off_t *)attributeBuffer + 1;
}
}
return (0);
}
-
-#if 1 // Installer workaround (2940423)
-/* this routine was added as part of the work around where some installers would fail */
-/* because they incorrectly assumed search results were in some kind of order. */
-/* This routine is used to indentify the problematic target. At this point we */
-/* only know of one. This routine could be modified for more (I hope not). */
-static Boolean IsTargetName( searchinfospec_t * searchInfoPtr, Boolean isHFSPlus )
-{
- if ( searchInfoPtr->name == NULL )
- return( false );
-
- if (isHFSPlus) {
- HFSUniStr255 myName = {
- 7, /* number of unicode characters */
- {
- 'L','i','b','r','a','r','y'
- }
- };
- if ( FastUnicodeCompare( myName.unicode, myName.length,
- (UniChar*)searchInfoPtr->name,
- searchInfoPtr->nameLength ) == 0 ) {
- return( true );
- }
-
- } else {
- u_char myName[32] = {
- 0x07,'L','i','b','r','a','r','y'
- };
- if ( FastRelString(myName, (u_char*)searchInfoPtr->name) == 0 ) {
- return( true );
- }
- }
- return( false );
-
-} /* IsTargetName */
-#endif // Installer workaround
-
projects / apple / xnu.git / blobdiff