Commit 3ac4e829 authored May 14, 2010 by Linus Torvalds

Merge branch 'for-linus' of...

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  mmap_min_addr check CAP_SYS_RAWIO only for write

parents 7ac992ef 4ae69e6b

security/min_addr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ int mmap_min_addr_handler(struct ctl_table *table, int write,
		{
		int ret;

		if (!capable(CAP_SYS_RAWIO))
		if (write && !capable(CAP_SYS_RAWIO))
		return -EPERM;

		ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);