James Morris cb5629b10d Merge branch 'master' into next ... Conflicts: fs/namei.c Manually merged per: diff --cc fs/namei.c index 734f2b5,bbc15c2..0000000 --- a/fs/namei.c +++ b/fs/namei.c @@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char nd->flags |= LOOKUP_CONTINUE; err = exec_permission_lite(inode); if (err == -EAGAIN) - err = vfs_permission(nd, MAY_EXEC); + err = inode_permission(nd->path.dentry->d_inode, + MAY_EXEC); + if (!err) + err = ima_path_check(&nd->path, MAY_EXEC); if (err) break; @@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc flag &= ~O_TRUNC; } - error = vfs_permission(nd, acc_mode); + error = inode_permission(inode, acc_mode); if (error) return error; + - error = ima_path_check(&nd->path, ++ error = ima_path_check(path, + acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC)); + if (error) + return error; /* * An append-only file must be opened in append mode for writing. */ Signed-off-by: James Morris <jmorris@namei.org>		2009-02-06 11:01:45 +11:00
..
ABI	Merge branch 'master' into next	2009-02-06 11:01:45 +11:00
accounting	Documentation/accounting/getdelays.c: fix endless loop	2009-01-15 16:39:37 -08:00
acpi
aoe
arm	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel	2008-12-29 18:08:11 +00:00
auxdisplay
blackfin	Blackfin arch: Add document about bfin-gpio	2009-01-07 23:14:38 +08:00
block	block: add text file detailing queue/ sysfs files	2009-02-02 13:02:31 +01:00
blockdev
cdrom
cgroups	memcg: update document to mention that swapoff should be tested	2009-01-29 18:04:44 -08:00
connector
console
cpu-freq	doc: Update sh cpufreq documentation.	2008-12-22 18:44:47 +09:00
cpuidle
cris
crypto	async_tx, dmaengine: document channel allocation and api rework	2009-01-05 18:10:19 -07:00
development-process	Fix a typo in the development process document.	2009-01-08 16:32:13 -07:00
device-mapper
DocBook	UIO: Add missing documentation of features added recently	2009-01-28 15:55:48 -08:00
driver-model
dvb	V4L/DVB (9812): [PATCH] short help for Technisat cards to select the right configuration	2008-12-30 09:38:35 -02:00
early-userspace
fault-injection
fb	[ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices	2008-12-29 18:00:04 +08:00
filesystems	Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6	2009-02-03 16:52:44 -08:00
firmware_class
frv
hwmon	Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6	2009-01-15 16:40:12 -08:00
i2c
i2o
ia64
ide	ide: update warm-plug HOWTO	2009-01-06 17:21:00 +01:00
infiniband
input	Merge commit 'v2.6.28-rc9' into next	2008-12-20 04:54:54 -05:00
ioctl	documentation: update header file paths	2009-01-06 15:59:28 -08:00
isdn
ja_JP	Sync patch for jp_JP/stable_kernel_rules.txt	2009-01-28 15:55:48 -08:00
kbuild	kbuild: fix kbuild.txt typos	2009-01-14 21:42:51 +01:00
kdump
ko_KR
laptops	ACPI: thinkpad-acpi: bump up version to 0.22	2009-01-15 13:48:24 -05:00
lguest	lguest: disable the FORTIFY for lguest.	2009-01-30 11:34:10 +10:30
m68k
make
mips	ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ	2009-01-14 19:19:03 +01:00
mn10300
mtd
namespaces
netlabel
networking	net: update documentation ip aliases	2009-01-29 16:16:31 -08:00
parisc
PCI	PCI: Add pci_clear_master() as opposite of pci_set_master()	2009-01-07 11:13:23 -08:00
pcmcia
power
powerpc	powerpc/5200: update device tree binding documentation	2009-01-30 08:23:33 -07:00
prctl
RCU	Merge branch 'docs-next' of git://git.lwn.net/linux-2.6	2009-01-08 15:52:13 -08:00
s390	documentation: update s390 header file paths	2009-01-06 15:59:28 -08:00
scheduler	cgroups: consolidate cgroup documents	2009-01-15 16:39:37 -08:00
scsi	fix similar typos to successfull	2009-01-08 08:31:15 -08:00
serial
sh	sh: Kill off remaining CONFIG_SH_KGDB bits.	2008-12-22 18:44:05 +09:00
sound	ALSA: hda: Add STAC92HD83XXX_PWR_REF quirk	2009-01-23 08:06:57 +01:00
sparc
spi	hwmon: (lm70) Code streamlining and cleanup	2009-01-07 16:37:34 +01:00
sysctl	Update of Documentation: vm.txt and proc.txt	2009-01-15 16:39:35 -08:00
telephony
thermal
timers
tracers
uml
usb	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
video4linux	V4L/DVB (10210): Fix a bug on v4lgrab.c	2009-01-29 08:35:37 -02:00
vm	mm: remove try_to_munlock from vmscan	2009-01-06 15:59:03 -08:00
w1	w1: send status messages after command processing	2009-01-08 08:31:14 -08:00
watchdog
wimax	i2400m: documentation and instructions for usage	2009-01-07 10:00:18 -08:00
x86	Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-10 06:13:09 -08:00
zh_CN
00-INDEX
applying-patches.txt
atomic_ops.txt
bad_memory.txt	Document handling of bad memory	2008-12-03 16:09:53 -07:00
basic_profiling.txt
binfmt_misc.txt
braille-console.txt
bt8xxgpio.txt
BUG-HUNTING
c2port.txt
cachetlb.txt
Changes	Documentation/Changes: add required versions for new filesystems	2009-01-29 18:19:30 -08:00
CodingStyle	fix emacs indenting howto filename expansion	2009-01-29 18:19:29 -08:00
cpu-hotplug.txt	x86: use possible_cpus=NUM to extend the possible cpus allowed	2008-12-18 12:08:05 +01:00
cpu-load.txt
cputopology.txt	sysfs: add documentation to cputopology.txt for system cpumasks	2008-12-19 17:47:12 +10:30
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt	trivial: fix an -> a typos in documentation and comments	2009-01-06 11:28:07 +01:00
devices.txt
DMA-API.txt	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
DMA-attributes.txt
DMA-ISA-LPC.txt
DMA-mapping.txt	documentation: update header file paths	2009-01-06 15:59:28 -08:00
dmaengine.txt	async_tx, dmaengine: document channel allocation and api rework	2009-01-05 18:10:19 -07:00
dontdiff
edac.txt
eisa.txt
email-clients.txt
exception.txt
feature-removal-schedule.txt	hwmon: Deprecate the fscher and fscpos drivers	2009-01-07 16:37:33 +01:00
ftrace.txt
gpio.txt
highuid.txt
HOWTO
hw_random.txt
ics932s401
initrd.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
IO-mapping.txt	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	documentation: how to use DOC: section blocks	2009-01-06 15:59:28 -08:00
kernel-docs.txt
kernel-parameters.txt	Merge branch 'master' into next	2009-02-06 11:01:45 +11:00
keys-request-key.txt
keys.txt
kobject.txt	kobject: Make Documentation/kobject.txt a little more coherent.	2009-01-06 10:44:32 -08:00
kprobes.txt	kprobes: support probing module __exit function	2009-01-06 15:59:21 -08:00
kref.txt
ldm.txt
leds-class.txt
local_ops.txt
lockdep-design.txt
lockstat.txt
logo.gif
logo.txt
magic-number.txt	documentation: update header file paths	2009-01-06 15:59:28 -08:00
Makefile
ManagementStyle
markers.txt
mca.txt
md.txt
memory-barriers.txt
memory-hotplug.txt	mm: show node to memory section relationship with symlinks in sysfs	2009-01-06 15:59:00 -08:00
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt	NOMMU: Make mmap allocation page trimming behaviour configurable.	2009-01-08 12:04:47 +00:00
numastat.txt
oops-tracing.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
SM501.txt
Smack.txt
sparse.txt
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist
SubmittingDrivers
SubmittingPatches
svga.txt
sysfs-rules.txt
sysrq.txt	sysrq documentation: document why the command header only is shown	2009-01-15 16:39:36 -08:00
tracepoints.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
video-output.txt
volatile-considered-harmful.txt
voyager.txt
zorro.txt