return 0;
}
-#define IS_TLD(x) strnstr((char *) path, x, MAXPATHLEN)
+#define IS_TLD(x) strnstr(__DECONST(char *, path), x, MAXPATHLEN)
if (IS_TLD("/.Spotlight-V100/") ||
IS_TLD("/.MobileBackups/") ||
IS_TLD("/Backups.backupdb/")) {
return 1;
}
#undef IS_TLD
-
+
return 0;
}
continue;
}
- if ( watcher->event_list[type] == FSE_REPORT
+ if ( type < watcher->num_events
+ && watcher->event_list[type] == FSE_REPORT
&& watcher_cares_about_dev(watcher, dev)) {
if (watcher_add_event(watcher, kfse) != 0) {
// its type or which device it is for)
//
kfse = watcher->event_queue[watcher->rd];
- if (!kfse || kfse->type == FSE_INVALID || kfse->refcount < 1) {
+ if (!kfse || kfse->type == FSE_INVALID || kfse->type >= watcher->num_events || kfse->refcount < 1) {
break;
}
}
#pragma pack(push, 4)
-typedef struct ext_fsevent_dev_filter_args {
- uint32_t num_devices;
- user_addr_t devices;
-} ext_fsevent_dev_filter_args;
-#pragma pack(pop)
-
-#define NEW_FSEVENTS_DEVICE_FILTER _IOW('s', 100, ext_fsevent_dev_filter_args)
-
-typedef struct old_fsevent_dev_filter_args {
- uint32_t num_devices;
- int32_t devices;
-} old_fsevent_dev_filter_args;
-
-#define OLD_FSEVENTS_DEVICE_FILTER _IOW('s', 100, old_fsevent_dev_filter_args)
-
-#if __LP64__
-/* need this in spite of the padding due to alignment of devices */
typedef struct fsevent_dev_filter_args32 {
- uint32_t num_devices;
- uint32_t devices;
- int32_t pad1;
+ uint32_t num_devices;
+ user32_addr_t devices;
} fsevent_dev_filter_args32;
-#endif
+typedef struct fsevent_dev_filter_args64 {
+ uint32_t num_devices;
+ user64_addr_t devices;
+} fsevent_dev_filter_args64;
+#pragma pack(pop)
+
+#define FSEVENTS_DEVICE_FILTER_32 _IOW('s', 100, fsevent_dev_filter_args32)
+#define FSEVENTS_DEVICE_FILTER_64 _IOW('s', 100, fsevent_dev_filter_args64)
static int
fseventsf_ioctl(struct fileproc *fp, u_long cmd, caddr_t data, vfs_context_t ctx)
{
fsevent_handle *fseh = (struct fsevent_handle *)fp->f_fglob->fg_data;
int ret = 0;
- ext_fsevent_dev_filter_args *devfilt_args, _devfilt_args;
-
- if (proc_is64bit(vfs_context_proc(ctx))) {
- devfilt_args = (ext_fsevent_dev_filter_args *)data;
- }
- else if (cmd == OLD_FSEVENTS_DEVICE_FILTER) {
- old_fsevent_dev_filter_args *udev_filt_args = (old_fsevent_dev_filter_args *)data;
-
- devfilt_args = &_devfilt_args;
- memset(devfilt_args, 0, sizeof(ext_fsevent_dev_filter_args));
-
- devfilt_args->num_devices = udev_filt_args->num_devices;
- devfilt_args->devices = CAST_USER_ADDR_T(udev_filt_args->devices);
- }
- else {
-#if __LP64__
- fsevent_dev_filter_args32 *udev_filt_args = (fsevent_dev_filter_args32 *)data;
-#else
- fsevent_dev_filter_args *udev_filt_args = (fsevent_dev_filter_args *)data;
-#endif
-
- devfilt_args = &_devfilt_args;
- memset(devfilt_args, 0, sizeof(ext_fsevent_dev_filter_args));
-
- devfilt_args->num_devices = udev_filt_args->num_devices;
- devfilt_args->devices = CAST_USER_ADDR_T(udev_filt_args->devices);
- }
+ fsevent_dev_filter_args64 *devfilt_args, _devfilt_args;
OSAddAtomic(1, &fseh->active);
if (fseh->flags & FSEH_CLOSING) {
break;
}
- case OLD_FSEVENTS_DEVICE_FILTER:
- case NEW_FSEVENTS_DEVICE_FILTER: {
+ case FSEVENTS_DEVICE_FILTER_32: {
+ if (proc_is64bit(vfs_context_proc(ctx))) {
+ ret = EINVAL;
+ break;
+ }
+ fsevent_dev_filter_args32 *devfilt_args32 = (fsevent_dev_filter_args32 *)data;
+
+ devfilt_args = &_devfilt_args;
+ memset(devfilt_args, 0, sizeof(fsevent_dev_filter_args64));
+ devfilt_args->num_devices = devfilt_args32->num_devices;
+ devfilt_args->devices = CAST_USER_ADDR_T(devfilt_args32->devices);
+ goto handle_dev_filter;
+ }
+
+ case FSEVENTS_DEVICE_FILTER_64:
+ if (!proc_is64bit(vfs_context_proc(ctx))) {
+ ret = EINVAL;
+ break;
+ }
+ devfilt_args = (fsevent_dev_filter_args64 *)data;
+
+ handle_dev_filter:
+ {
int new_num_devices;
dev_t *devices_not_to_watch, *tmp=NULL;
}
+static int
+filt_fsevent_touch(struct knote *kn, struct kevent_internal_s *kev)
+{
+ int res;
+
+ lock_watch_table();
+
+ /* accept new fflags/data as saved */
+ kn->kn_sfflags = kev->fflags;
+ kn->kn_sdata = kev->data;
+ if ((kn->kn_status & KN_UDATA_SPECIFIC) == 0)
+ kn->kn_udata = kev->udata;
+
+ /* restrict the current results to the (smaller?) set of new interest */
+ /*
+ * For compatibility with previous implementations, we leave kn_fflags
+ * as they were before.
+ */
+ //kn->kn_fflags &= kev->fflags;
+
+ /* determine if the filter is now fired */
+ res = filt_fsevent(kn, 0);
+
+ unlock_watch_table();
+
+ return res;
+}
+
+static int
+filt_fsevent_process(struct knote *kn, struct filt_process_s *data, struct kevent_internal_s *kev)
+{
+#pragma unused(data)
+ int res;
+
+ lock_watch_table();
+
+ res = filt_fsevent(kn, 0);
+ if (res) {
+ *kev = kn->kn_kevent;
+ if (kev->flags & EV_CLEAR) {
+ kn->kn_data = 0;
+ kn->kn_fflags = 0;
+ }
+ }
+
+ unlock_watch_table();
+ return res;
+}
+
struct filterops fsevent_filtops = {
.f_isfd = 1,
.f_attach = NULL,
.f_detach = filt_fsevent_detach,
- .f_event = filt_fsevent
+ .f_event = filt_fsevent,
+ .f_touch = filt_fsevent_touch,
+ .f_process = filt_fsevent_process,
};
static int
fseventsf_kqfilter(__unused struct fileproc *fp, __unused struct knote *kn, __unused vfs_context_t ctx)
{
fsevent_handle *fseh = (struct fsevent_handle *)fp->f_fglob->fg_data;
+ int res;
kn->kn_hook = (void*)fseh;
kn->kn_hookid = 1;
- kn->kn_fop = &fsevent_filtops;
-
+ kn->kn_filtid = EVFILTID_FSEVENT;
+
lock_watch_table();
KNOTE_ATTACH(&fseh->knotes, kn);
+ /* check to see if it is fired already */
+ res = filt_fsevent(kn, 0);
+
unlock_watch_table();
- return 0;
+
+ return res;
}
lck_mtx_lock(&event_writer_lock);
if (write_buffer == NULL) {
- if (kmem_alloc(kernel_map, (vm_offset_t *)&write_buffer, WRITE_BUFFER_SIZE)) {
+ if (kmem_alloc(kernel_map, (vm_offset_t *)&write_buffer, WRITE_BUFFER_SIZE, VM_KERN_MEMORY_FILE)) {
lck_mtx_unlock(&event_writer_lock);
return ENOMEM;
}
static const struct fileops fsevents_fops = {
- DTYPE_FSEVENTS,
- fseventsf_read,
- fseventsf_write,
- fseventsf_ioctl,
- fseventsf_select,
- fseventsf_close,
- fseventsf_kqfilter,
- fseventsf_drain
+ .fo_type = DTYPE_FSEVENTS,
+ .fo_read = fseventsf_read,
+ .fo_write = fseventsf_write,
+ .fo_ioctl = fseventsf_ioctl,
+ .fo_select = fseventsf_select,
+ .fo_close = fseventsf_close,
+ .fo_kqfilter = fseventsf_kqfilter,
+ .fo_drain = fseventsf_drain,
};
-typedef struct ext_fsevent_clone_args {
- user_addr_t event_list;
- int32_t num_events;
- int32_t event_queue_depth;
- user_addr_t fd;
-} ext_fsevent_clone_args;
+typedef struct fsevent_clone_args32 {
+ user32_addr_t event_list;
+ int32_t num_events;
+ int32_t event_queue_depth;
+ user32_addr_t fd;
+} fsevent_clone_args32;
-typedef struct old_fsevent_clone_args {
- uint32_t event_list;
- int32_t num_events;
- int32_t event_queue_depth;
- uint32_t fd;
-} old_fsevent_clone_args;
+typedef struct fsevent_clone_args64 {
+ user64_addr_t event_list;
+ int32_t num_events;
+ int32_t event_queue_depth;
+ user64_addr_t fd;
+} fsevent_clone_args64;
-#define OLD_FSEVENTS_CLONE _IOW('s', 1, old_fsevent_clone_args)
+#define FSEVENTS_CLONE_32 _IOW('s', 1, fsevent_clone_args32)
+#define FSEVENTS_CLONE_64 _IOW('s', 1, fsevent_clone_args64)
static int
fseventsioctl(__unused dev_t dev, u_long cmd, caddr_t data, __unused int flag, struct proc *p)
struct fileproc *f;
int fd, error;
fsevent_handle *fseh = NULL;
- ext_fsevent_clone_args *fse_clone_args, _fse_clone;
+ fsevent_clone_args64 *fse_clone_args, _fse_clone;
int8_t *event_list;
int is64bit = proc_is64bit(p);
switch (cmd) {
- case OLD_FSEVENTS_CLONE: {
- old_fsevent_clone_args *old_args = (old_fsevent_clone_args *)data;
+ case FSEVENTS_CLONE_32: {
+ if (is64bit) {
+ return EINVAL;
+ }
+ fsevent_clone_args32 *args32 = (fsevent_clone_args32 *)data;
fse_clone_args = &_fse_clone;
- memset(fse_clone_args, 0, sizeof(ext_fsevent_clone_args));
+ memset(fse_clone_args, 0, sizeof(fsevent_clone_args64));
- fse_clone_args->event_list = CAST_USER_ADDR_T(old_args->event_list);
- fse_clone_args->num_events = old_args->num_events;
- fse_clone_args->event_queue_depth = old_args->event_queue_depth;
- fse_clone_args->fd = CAST_USER_ADDR_T(old_args->fd);
+ fse_clone_args->event_list = CAST_USER_ADDR_T(args32->event_list);
+ fse_clone_args->num_events = args32->num_events;
+ fse_clone_args->event_queue_depth = args32->event_queue_depth;
+ fse_clone_args->fd = CAST_USER_ADDR_T(args32->fd);
goto handle_clone;
}
-
- case FSEVENTS_CLONE:
- if (is64bit) {
- fse_clone_args = (ext_fsevent_clone_args *)data;
- } else {
- fsevent_clone_args *ufse_clone = (fsevent_clone_args *)data;
-
- fse_clone_args = &_fse_clone;
- memset(fse_clone_args, 0, sizeof(ext_fsevent_clone_args));
- fse_clone_args->event_list = CAST_USER_ADDR_T(ufse_clone->event_list);
- fse_clone_args->num_events = ufse_clone->num_events;
- fse_clone_args->event_queue_depth = ufse_clone->event_queue_depth;
- fse_clone_args->fd = CAST_USER_ADDR_T(ufse_clone->fd);
+ case FSEVENTS_CLONE_64:
+ if (!is64bit) {
+ return EINVAL;
}
+ fse_clone_args = (fsevent_clone_args64 *)data;
handle_clone:
if (fse_clone_args->num_events < 0 || fse_clone_args->num_events > 4096) {
}
#else /* CONFIG_FSE */
+
+#include <sys/fsevents.h>
+
/*
* The get_pathbuff and release_pathbuff routines are used in places not
* related to fsevents, and it's a handy abstraction, so define trivial
{
FREE_ZONE(path, MAXPATHLEN, M_NAMEI);
}
+
+int
+add_fsevent(__unused int type, __unused vfs_context_t ctx, ...)
+{
+ return 0;
+}
+
+int need_fsevent(__unused int type, __unused vnode_t vp)
+{
+ return 0;
+}
+
#endif /* CONFIG_FSE */
projects / apple / xnu.git / blobdiff