inotify_user.c 19.5 KB
Newer Older
1 2 3 4 5 6 7 8 9 10
/*
 * fs/inotify_user.c - inotify support for userspace
 *
 * Authors:
 *	John McCutchan	<ttb@tentacle.dhs.org>
 *	Robert Love	<rml@novell.com>
 *
 * Copyright (C) 2005 John McCutchan
 * Copyright 2006 Hewlett-Packard Development Company, L.P.
 *
11 12 13
 * Copyright (C) 2009 Eric Paris <Red Hat Inc>
 * inotify was largely rewriten to make use of the fsnotify infrastructure
 *
14 15 16 17 18 19 20 21 22 23 24 25
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation; either version 2, or (at your option) any
 * later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 */

#include <linux/file.h>
26 27 28 29
#include <linux/fs.h> /* struct inode */
#include <linux/fsnotify_backend.h>
#include <linux/idr.h>
#include <linux/init.h> /* module_init */
30
#include <linux/inotify.h>
31 32 33 34
#include <linux/kernel.h> /* roundup() */
#include <linux/namei.h> /* LOOKUP_FOLLOW */
#include <linux/sched.h> /* struct user */
#include <linux/slab.h> /* struct kmem_cache */
35
#include <linux/syscalls.h>
36
#include <linux/types.h>
A
Al Viro 已提交
37
#include <linux/anon_inodes.h>
38 39 40
#include <linux/uaccess.h>
#include <linux/poll.h>
#include <linux/wait.h>
41

42
#include "inotify.h"
43

44
#include <asm/ioctls.h>
45 46

/* these are configurable via /proc/sys/fs/inotify/ */
47 48
static int inotify_max_user_instances __read_mostly;
static int inotify_max_queued_events __read_mostly;
49
int inotify_max_user_watches __read_mostly;
50

51 52
static struct kmem_cache *inotify_inode_mark_cachep __read_mostly;
struct kmem_cache *event_priv_cachep __read_mostly;
53 54

/*
55 56
 * When inotify registers a new group it increments this and uses that
 * value as an offset to set the fsnotify group "name" and priority.
57
 */
58
static atomic_t inotify_grp_num;
59 60 61 62 63 64 65 66 67 68 69 70 71

#ifdef CONFIG_SYSCTL

#include <linux/sysctl.h>

static int zero;

ctl_table inotify_table[] = {
	{
		.procname	= "max_user_instances",
		.data		= &inotify_max_user_instances,
		.maxlen		= sizeof(int),
		.mode		= 0644,
72
		.proc_handler	= proc_dointvec_minmax,
73 74 75 76 77 78 79
		.extra1		= &zero,
	},
	{
		.procname	= "max_user_watches",
		.data		= &inotify_max_user_watches,
		.maxlen		= sizeof(int),
		.mode		= 0644,
80
		.proc_handler	= proc_dointvec_minmax,
81 82 83 84 85 86 87
		.extra1		= &zero,
	},
	{
		.procname	= "max_queued_events",
		.data		= &inotify_max_queued_events,
		.maxlen		= sizeof(int),
		.mode		= 0644,
88
		.proc_handler	= proc_dointvec_minmax,
89 90
		.extra1		= &zero
	},
91
	{ }
92 93 94
};
#endif /* CONFIG_SYSCTL */

95
static inline __u32 inotify_arg_to_mask(u32 arg)
Y
Yan Zheng 已提交
96
{
97
	__u32 mask;
Y
Yan Zheng 已提交
98

99 100
	/* everything should accept their own ignored and cares about children */
	mask = (FS_IN_IGNORED | FS_EVENT_ON_CHILD);
101

102 103
	/* mask off the flags used to open the fd */
	mask |= (arg & (IN_ALL_EVENTS | IN_ONESHOT));
104

105
	return mask;
106 107
}

108
static inline u32 inotify_mask_to_arg(__u32 mask)
109
{
110 111
	return mask & (IN_ALL_EVENTS | IN_ISDIR | IN_UNMOUNT | IN_IGNORED |
		       IN_Q_OVERFLOW);
112 113
}

114
/* intofiy userspace file descriptor functions */
115 116
static unsigned int inotify_poll(struct file *file, poll_table *wait)
{
117
	struct fsnotify_group *group = file->private_data;
118 119
	int ret = 0;

120 121 122
	poll_wait(file, &group->notification_waitq, wait);
	mutex_lock(&group->notification_mutex);
	if (!fsnotify_notify_queue_is_empty(group))
123
		ret = POLLIN | POLLRDNORM;
124
	mutex_unlock(&group->notification_mutex);
125 126 127 128

	return ret;
}

129 130 131 132 133
/*
 * Get an inotify_kernel_event if one exists and is small
 * enough to fit in "count". Return an error pointer if
 * not large enough.
 *
134
 * Called with the group->notification_mutex held.
135
 */
136 137
static struct fsnotify_event *get_one_event(struct fsnotify_group *group,
					    size_t count)
138 139
{
	size_t event_size = sizeof(struct inotify_event);
140
	struct fsnotify_event *event;
141

142
	if (fsnotify_notify_queue_is_empty(group))
143 144
		return NULL;

145 146
	event = fsnotify_peek_notify_event(group);

147 148
	if (event->name_len)
		event_size += roundup(event->name_len + 1, event_size);
149 150 151 152

	if (event_size > count)
		return ERR_PTR(-EINVAL);

153 154 155 156 157
	/* held the notification_mutex the whole time, so this is the
	 * same event we peeked above */
	fsnotify_remove_notify_event(group);

	return event;
158 159 160 161 162 163 164 165
}

/*
 * Copy an event to user space, returning how much we copied.
 *
 * We already checked that the event size is smaller than the
 * buffer we had in "get_one_event()" above.
 */
166 167
static ssize_t copy_event_to_user(struct fsnotify_group *group,
				  struct fsnotify_event *event,
168 169
				  char __user *buf)
{
170 171 172
	struct inotify_event inotify_event;
	struct fsnotify_event_private_data *fsn_priv;
	struct inotify_event_private_data *priv;
173
	size_t event_size = sizeof(struct inotify_event);
174
	size_t name_len = 0;
175 176 177 178 179 180 181 182 183 184 185 186 187 188 189

	/* we get the inotify watch descriptor from the event private data */
	spin_lock(&event->lock);
	fsn_priv = fsnotify_remove_priv_from_event(group, event);
	spin_unlock(&event->lock);

	if (!fsn_priv)
		inotify_event.wd = -1;
	else {
		priv = container_of(fsn_priv, struct inotify_event_private_data,
				    fsnotify_event_priv_data);
		inotify_event.wd = priv->wd;
		inotify_free_event_priv(fsn_priv);
	}

190 191
	/*
	 * round up event->name_len so it is a multiple of event_size
192 193
	 * plus an extra byte for the terminating '\0'.
	 */
194 195
	if (event->name_len)
		name_len = roundup(event->name_len + 1, event_size);
196 197 198 199
	inotify_event.len = name_len;

	inotify_event.mask = inotify_mask_to_arg(event->mask);
	inotify_event.cookie = event->sync_cookie;
200

201 202
	/* send the main event */
	if (copy_to_user(buf, &inotify_event, event_size))
203 204
		return -EFAULT;

205
	buf += event_size;
206

207 208 209 210 211 212 213 214 215
	/*
	 * fsnotify only stores the pathname, so here we have to send the pathname
	 * and then pad that pathname out to a multiple of sizeof(inotify_event)
	 * with zeros.  I get my zeros from the nul_inotify_event.
	 */
	if (name_len) {
		unsigned int len_to_zero = name_len - event->name_len;
		/* copy the path name */
		if (copy_to_user(buf, event->file_name, event->name_len))
216
			return -EFAULT;
217
		buf += event->name_len;
218

219 220
		/* fill userspace with 0's */
		if (clear_user(buf, len_to_zero))
221 222 223
			return -EFAULT;
		buf += len_to_zero;
		event_size += name_len;
224
	}
225

226 227 228
	return event_size;
}

229 230 231
static ssize_t inotify_read(struct file *file, char __user *buf,
			    size_t count, loff_t *pos)
{
232 233
	struct fsnotify_group *group;
	struct fsnotify_event *kevent;
234 235 236 237 238
	char __user *start;
	int ret;
	DEFINE_WAIT(wait);

	start = buf;
239
	group = file->private_data;
240 241

	while (1) {
242
		prepare_to_wait(&group->notification_waitq, &wait, TASK_INTERRUPTIBLE);
243

244 245 246
		mutex_lock(&group->notification_mutex);
		kevent = get_one_event(group, count);
		mutex_unlock(&group->notification_mutex);
247

248 249 250 251
		if (kevent) {
			ret = PTR_ERR(kevent);
			if (IS_ERR(kevent))
				break;
252 253
			ret = copy_event_to_user(group, kevent, buf);
			fsnotify_put_event(kevent);
254 255 256 257 258
			if (ret < 0)
				break;
			buf += ret;
			count -= ret;
			continue;
259 260
		}

261 262
		ret = -EAGAIN;
		if (file->f_flags & O_NONBLOCK)
263
			break;
264 265
		ret = -EINTR;
		if (signal_pending(current))
266
			break;
267

268
		if (start != buf)
269
			break;
270

271
		schedule();
272 273
	}

274
	finish_wait(&group->notification_waitq, &wait);
275 276
	if (start != buf && ret != -EFAULT)
		ret = buf - start;
277 278 279
	return ret;
}

280 281
static int inotify_fasync(int fd, struct file *file, int on)
{
282
	struct fsnotify_group *group = file->private_data;
283

284
	return fasync_helper(fd, file, on, &group->inotify_data.fa) >= 0 ? 0 : -EIO;
285 286
}

287 288
static int inotify_release(struct inode *ignored, struct file *file)
{
289
	struct fsnotify_group *group = file->private_data;
290
	struct user_struct *user = group->inotify_data.user;
291

292
	fsnotify_clear_marks_by_group(group);
293

294 295
	/* free this group, matching get was inotify_init->fsnotify_obtain_group */
	fsnotify_put_group(group);
296

297 298
	atomic_dec(&user->inotify_devs);

299 300 301 302 303 304
	return 0;
}

static long inotify_ioctl(struct file *file, unsigned int cmd,
			  unsigned long arg)
{
305 306 307
	struct fsnotify_group *group;
	struct fsnotify_event_holder *holder;
	struct fsnotify_event *event;
308 309
	void __user *p;
	int ret = -ENOTTY;
310
	size_t send_len = 0;
311

312
	group = file->private_data;
313 314 315 316
	p = (void __user *) arg;

	switch (cmd) {
	case FIONREAD:
317 318 319 320
		mutex_lock(&group->notification_mutex);
		list_for_each_entry(holder, &group->notification_list, event_list) {
			event = holder->event;
			send_len += sizeof(struct inotify_event);
321 322 323
			if (event->name_len)
				send_len += roundup(event->name_len + 1,
						sizeof(struct inotify_event));
324 325 326
		}
		mutex_unlock(&group->notification_mutex);
		ret = put_user(send_len, (int __user *) p);
327 328 329 330 331 332 333
		break;
	}

	return ret;
}

static const struct file_operations inotify_fops = {
334 335 336 337 338
	.poll		= inotify_poll,
	.read		= inotify_read,
	.fasync		= inotify_fasync,
	.release	= inotify_release,
	.unlocked_ioctl	= inotify_ioctl,
339 340 341 342
	.compat_ioctl	= inotify_ioctl,
};


343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359
/*
 * find_inode - resolve a user-given path to a specific inode
 */
static int inotify_find_inode(const char __user *dirname, struct path *path, unsigned flags)
{
	int error;

	error = user_path_at(AT_FDCWD, dirname, flags, path);
	if (error)
		return error;
	/* you can only watch an inode if you have read permissions on it */
	error = inode_permission(path->dentry->d_inode, MAY_READ);
	if (error)
		path_put(path);
	return error;
}

360 361 362 363
/*
 * Remove the mark from the idr (if present) and drop the reference
 * on the mark because it was in the idr.
 */
364 365 366 367
static void inotify_remove_from_idr(struct fsnotify_group *group,
				    struct inotify_inode_mark_entry *ientry)
{
	struct idr *idr;
368 369 370
	struct fsnotify_mark_entry *entry;
	struct inotify_inode_mark_entry *found_ientry;
	int wd;
371 372 373

	spin_lock(&group->inotify_data.idr_lock);
	idr = &group->inotify_data.idr;
374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396
	wd = ientry->wd;

	if (wd == -1)
		goto out;

	entry = idr_find(&group->inotify_data.idr, wd);
	if (unlikely(!entry))
		goto out;

	found_ientry = container_of(entry, struct inotify_inode_mark_entry, fsn_entry);
	if (unlikely(found_ientry != ientry)) {
		/* We found an entry in the idr with the right wd, but it's
		 * not the entry we were told to remove.  eparis seriously
		 * fucked up somewhere. */
		WARN_ON(1);
		ientry->wd = -1;
		goto out;
	}

	/* One ref for being in the idr, one ref held by the caller */
	BUG_ON(atomic_read(&entry->refcnt) < 2);

	idr_remove(idr, wd);
397
	ientry->wd = -1;
398 399 400 401 402

	/* removed from the idr, drop that ref */
	fsnotify_put_mark(entry);
out:
	spin_unlock(&group->inotify_data.idr_lock);
403
}
404

405
/*
406
 * Send IN_IGNORED for this wd, remove this wd from the idr.
407
 */
408 409
void inotify_ignored_and_remove_idr(struct fsnotify_mark_entry *entry,
				    struct fsnotify_group *group)
410 411
{
	struct inotify_inode_mark_entry *ientry;
412
	struct fsnotify_event *ignored_event;
413 414
	struct inotify_event_private_data *event_priv;
	struct fsnotify_event_private_data *fsn_event_priv;
E
Eric Paris 已提交
415
	int ret;
416

417 418 419 420 421 422
	ignored_event = fsnotify_create_event(NULL, FS_IN_IGNORED, NULL,
					      FSNOTIFY_EVENT_NONE, NULL, 0,
					      GFP_NOFS);
	if (!ignored_event)
		return;

423 424
	ientry = container_of(entry, struct inotify_inode_mark_entry, fsn_entry);

425
	event_priv = kmem_cache_alloc(event_priv_cachep, GFP_NOFS);
426 427 428 429 430 431 432 433
	if (unlikely(!event_priv))
		goto skip_send_ignore;

	fsn_event_priv = &event_priv->fsnotify_event_priv_data;

	fsn_event_priv->group = group;
	event_priv->wd = ientry->wd;

E
Eric Paris 已提交
434 435
	ret = fsnotify_add_notify_event(group, ignored_event, fsn_event_priv);
	if (ret)
436 437 438 439
		inotify_free_event_priv(fsn_event_priv);

skip_send_ignore:

440 441 442
	/* matches the reference taken when the event was created */
	fsnotify_put_event(ignored_event);

443
	/* remove this entry from the idr */
444
	inotify_remove_from_idr(group, ientry);
445

446
	atomic_dec(&group->inotify_data.user->inotify_watches);
447 448 449 450 451 452 453 454 455 456
}

/* ding dong the mark is dead */
static void inotify_free_mark(struct fsnotify_mark_entry *entry)
{
	struct inotify_inode_mark_entry *ientry = (struct inotify_inode_mark_entry *)entry;

	kmem_cache_free(inotify_inode_mark_cachep, ientry);
}

457 458 459
static int inotify_update_existing_watch(struct fsnotify_group *group,
					 struct inode *inode,
					 u32 arg)
460
{
461
	struct fsnotify_mark_entry *entry;
462 463
	struct inotify_inode_mark_entry *ientry;
	__u32 old_mask, new_mask;
464 465 466
	__u32 mask;
	int add = (arg & IN_MASK_ADD);
	int ret;
467 468 469 470 471 472 473 474 475

	/* don't allow invalid bits: we don't want flags set */
	mask = inotify_arg_to_mask(arg);
	if (unlikely(!mask))
		return -EINVAL;

	spin_lock(&inode->i_lock);
	entry = fsnotify_find_mark_entry(group, inode);
	spin_unlock(&inode->i_lock);
476 477
	if (!entry)
		return -ENOENT;
478

479
	ientry = container_of(entry, struct inotify_inode_mark_entry, fsn_entry);
480

481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510
	spin_lock(&entry->lock);

	old_mask = entry->mask;
	if (add) {
		entry->mask |= mask;
		new_mask = entry->mask;
	} else {
		entry->mask = mask;
		new_mask = entry->mask;
	}

	spin_unlock(&entry->lock);

	if (old_mask != new_mask) {
		/* more bits in old than in new? */
		int dropped = (old_mask & ~new_mask);
		/* more bits in this entry than the inode's mask? */
		int do_inode = (new_mask & ~inode->i_fsnotify_mask);
		/* more bits in this entry than the group? */
		int do_group = (new_mask & ~group->mask);

		/* update the inode with this new entry */
		if (dropped || do_inode)
			fsnotify_recalc_inode_mask(inode);

		/* update the group mask with the new mask */
		if (dropped || do_group)
			fsnotify_recalc_group_mask(group);
	}

511 512 513 514
	/* return the wd */
	ret = ientry->wd;

	/* match the get from fsnotify_find_mark_entry() */
515 516
	fsnotify_put_mark(entry);

517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548
	return ret;
}

static int inotify_new_watch(struct fsnotify_group *group,
			     struct inode *inode,
			     u32 arg)
{
	struct inotify_inode_mark_entry *tmp_ientry;
	__u32 mask;
	int ret;

	/* don't allow invalid bits: we don't want flags set */
	mask = inotify_arg_to_mask(arg);
	if (unlikely(!mask))
		return -EINVAL;

	tmp_ientry = kmem_cache_alloc(inotify_inode_mark_cachep, GFP_KERNEL);
	if (unlikely(!tmp_ientry))
		return -ENOMEM;

	fsnotify_init_mark(&tmp_ientry->fsn_entry, inotify_free_mark);
	tmp_ientry->fsn_entry.mask = mask;
	tmp_ientry->wd = -1;

	ret = -ENOSPC;
	if (atomic_read(&group->inotify_data.user->inotify_watches) >= inotify_max_user_watches)
		goto out_err;
retry:
	ret = -ENOMEM;
	if (unlikely(!idr_pre_get(&group->inotify_data.idr, GFP_KERNEL)))
		goto out_err;

549 550 551
	/* we are putting the mark on the idr, take a reference */
	fsnotify_get_mark(&tmp_ientry->fsn_entry);

552 553
	spin_lock(&group->inotify_data.idr_lock);
	ret = idr_get_new_above(&group->inotify_data.idr, &tmp_ientry->fsn_entry,
554
				group->inotify_data.last_wd+1,
555 556 557
				&tmp_ientry->wd);
	spin_unlock(&group->inotify_data.idr_lock);
	if (ret) {
558 559 560
		/* we didn't get on the idr, drop the idr reference */
		fsnotify_put_mark(&tmp_ientry->fsn_entry);

561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583
		/* idr was out of memory allocate and try again */
		if (ret == -EAGAIN)
			goto retry;
		goto out_err;
	}

	/* we are on the idr, now get on the inode */
	ret = fsnotify_add_mark(&tmp_ientry->fsn_entry, group, inode);
	if (ret) {
		/* we failed to get on the inode, get off the idr */
		inotify_remove_from_idr(group, tmp_ientry);
		goto out_err;
	}

	/* update the idr hint, who cares about races, it's just a hint */
	group->inotify_data.last_wd = tmp_ientry->wd;

	/* increment the number of watches the user has */
	atomic_inc(&group->inotify_data.user->inotify_watches);

	/* return the watch descriptor for this new entry */
	ret = tmp_ientry->wd;

584 585 586 587
	/* if this mark added a new event update the group mask */
	if (mask & ~group->mask)
		fsnotify_recalc_group_mask(group);

588
out_err:
589 590
	/* match the ref from fsnotify_init_markentry() */
	fsnotify_put_mark(&tmp_ientry->fsn_entry);
591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611

	return ret;
}

static int inotify_update_watch(struct fsnotify_group *group, struct inode *inode, u32 arg)
{
	int ret = 0;

retry:
	/* try to update and existing watch with the new arg */
	ret = inotify_update_existing_watch(group, inode, arg);
	/* no mark present, try to add a new one */
	if (ret == -ENOENT)
		ret = inotify_new_watch(group, inode, arg);
	/*
	 * inotify_new_watch could race with another thread which did an
	 * inotify_new_watch between the update_existing and the add watch
	 * here, go back and try to update an existing mark again.
	 */
	if (ret == -EEXIST)
		goto retry;
612

613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630
	return ret;
}

static struct fsnotify_group *inotify_new_group(struct user_struct *user, unsigned int max_events)
{
	struct fsnotify_group *group;
	unsigned int grp_num;

	/* fsnotify_obtain_group took a reference to group, we put this when we kill the file in the end */
	grp_num = (INOTIFY_GROUP_NUM - atomic_inc_return(&inotify_grp_num));
	group = fsnotify_obtain_group(grp_num, 0, &inotify_fsnotify_ops);
	if (IS_ERR(group))
		return group;

	group->max_events = max_events;

	spin_lock_init(&group->inotify_data.idr_lock);
	idr_init(&group->inotify_data.idr);
631
	group->inotify_data.last_wd = 0;
632 633 634 635 636 637 638 639
	group->inotify_data.user = user;
	group->inotify_data.fa = NULL;

	return group;
}


/* inotify syscalls */
640
SYSCALL_DEFINE1(inotify_init1, int, flags)
641
{
642
	struct fsnotify_group *group;
643
	struct user_struct *user;
A
Al Viro 已提交
644
	int ret;
645

646 647 648 649
	/* Check the IN_* constants for consistency.  */
	BUILD_BUG_ON(IN_CLOEXEC != O_CLOEXEC);
	BUILD_BUG_ON(IN_NONBLOCK != O_NONBLOCK);

650
	if (flags & ~(IN_CLOEXEC | IN_NONBLOCK))
U
Ulrich Drepper 已提交
651 652
		return -EINVAL;

653
	user = get_current_user();
654 655 656 657 658 659
	if (unlikely(atomic_read(&user->inotify_devs) >=
			inotify_max_user_instances)) {
		ret = -EMFILE;
		goto out_free_uid;
	}

660 661 662 663
	/* fsnotify_obtain_group took a reference to group, we put this when we kill the file in the end */
	group = inotify_new_group(user, inotify_max_queued_events);
	if (IS_ERR(group)) {
		ret = PTR_ERR(group);
664 665 666
		goto out_free_uid;
	}

A
Al Viro 已提交
667 668
	atomic_inc(&user->inotify_devs);

A
Al Viro 已提交
669 670 671 672
	ret = anon_inode_getfd("inotify", &inotify_fops, group,
				  O_RDONLY | flags);
	if (ret >= 0)
		return ret;
A
Al Viro 已提交
673 674

	atomic_dec(&user->inotify_devs);
675 676 677 678 679
out_free_uid:
	free_uid(user);
	return ret;
}

680
SYSCALL_DEFINE0(inotify_init)
U
Ulrich Drepper 已提交
681 682 683 684
{
	return sys_inotify_init1(0);
}

685 686
SYSCALL_DEFINE3(inotify_add_watch, int, fd, const char __user *, pathname,
		u32, mask)
687
{
688
	struct fsnotify_group *group;
689
	struct inode *inode;
690
	struct path path;
691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709
	struct file *filp;
	int ret, fput_needed;
	unsigned flags = 0;

	filp = fget_light(fd, &fput_needed);
	if (unlikely(!filp))
		return -EBADF;

	/* verify that this is indeed an inotify instance */
	if (unlikely(filp->f_op != &inotify_fops)) {
		ret = -EINVAL;
		goto fput_and_out;
	}

	if (!(mask & IN_DONT_FOLLOW))
		flags |= LOOKUP_FOLLOW;
	if (mask & IN_ONLYDIR)
		flags |= LOOKUP_DIRECTORY;

710 711
	ret = inotify_find_inode(pathname, &path, flags);
	if (ret)
712 713
		goto fput_and_out;

714
	/* inode held in place by reference to path; group by fget on fd */
715
	inode = path.dentry->d_inode;
716
	group = filp->private_data;
717

718 719
	/* create/update an inode mark */
	ret = inotify_update_watch(group, inode, mask);
720
	path_put(&path);
721 722 723 724 725
fput_and_out:
	fput_light(filp, fput_needed);
	return ret;
}

726
SYSCALL_DEFINE2(inotify_rm_watch, int, fd, __s32, wd)
727
{
728 729
	struct fsnotify_group *group;
	struct fsnotify_mark_entry *entry;
730
	struct file *filp;
731
	int ret = 0, fput_needed;
732 733 734 735 736 737 738 739 740 741 742

	filp = fget_light(fd, &fput_needed);
	if (unlikely(!filp))
		return -EBADF;

	/* verify that this is indeed an inotify instance */
	if (unlikely(filp->f_op != &inotify_fops)) {
		ret = -EINVAL;
		goto out;
	}

743
	group = filp->private_data;
744

745 746 747 748 749 750 751 752 753 754
	spin_lock(&group->inotify_data.idr_lock);
	entry = idr_find(&group->inotify_data.idr, wd);
	if (unlikely(!entry)) {
		spin_unlock(&group->inotify_data.idr_lock);
		ret = -EINVAL;
		goto out;
	}
	fsnotify_get_mark(entry);
	spin_unlock(&group->inotify_data.idr_lock);

755
	fsnotify_destroy_mark_by_entry(entry);
756
	fsnotify_put_mark(entry);
757 758 759 760 761 762 763 764 765 766 767 768 769

out:
	fput_light(filp, fput_needed);
	return ret;
}

/*
 * inotify_user_setup - Our initialization function.  Note that we cannnot return
 * error because we have compiled-in VFS hooks.  So an (unlikely) failure here
 * must result in panic().
 */
static int __init inotify_user_setup(void)
{
770 771 772
	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark_entry, SLAB_PANIC);
	event_priv_cachep = KMEM_CACHE(inotify_event_private_data, SLAB_PANIC);

773 774 775 776 777 778 779
	inotify_max_queued_events = 16384;
	inotify_max_user_instances = 128;
	inotify_max_user_watches = 8192;

	return 0;
}
module_init(inotify_user_setup);