linux

History

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
..
accessibility	…
acpi	Merge branch 'misc' into release	2009-01-16 14:45:34 -05:00
amba	…
ata	Fix my email address in qd65xx.[ch]/pata_qdi.c	2009-02-03 16:53:56 -08:00
atm	…
auxdisplay	…
base	driver-core: fix kernel-doc parameter name	2009-01-28 15:55:48 -08:00
block	powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block	2009-01-16 16:15:13 +11:00
bluetooth	…
cdrom	…
char	Merge branch 'master' into next	2009-02-06 11:01:45 +11:00
clocksource	…
connector	…
cpufreq	Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-10 06:12:18 -08:00
cpuidle	…
crypto	…
dca	dca: redesign locks to fix deadlocks	2009-02-02 23:26:57 -08:00
dio	m68k: dio - Kill resource_size_t format warnings	2009-01-12 20:56:42 +01:00
dma	i.MX31: Image Processing Unit DMA and IRQ drivers	2009-01-19 15:36:21 -07:00
edac	powerpc: More printing warning fixes for the l64 to ll64 conversion	2009-01-28 17:15:52 +11:00
eisa	…
firewire	firewire: sbp2: add workarounds for 2nd and 3rd generation iPods	2009-01-29 20:19:48 +01:00
firmware	DMI: Introduce dmi_first_match to make the interface more flexible	2009-01-27 02:15:47 -05:00
gpio	gpiolib: fix request related issue	2009-01-29 18:04:43 -08:00
gpu	Stop playing silly games with the VM_ACCOUNT flag	2009-01-31 15:08:56 -08:00
hid	HID: document difference between hid_blacklist and hid_ignore_list	2009-01-29 11:23:12 +01:00
hwmon	lis3lv02d: add axes knowledge for HP 6710	2009-02-05 12:56:47 -08:00
i2c	i2c: Move old eeprom driver to /drivers/misc/eeprom	2009-01-26 21:19:53 +01:00
ide	Fix my email address in qd65xx.[ch]/pata_qdi.c	2009-02-03 16:53:56 -08:00
idle	…
ieee1394	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2009-01-29 18:09:41 -08:00
infiniband	Merge branches 'ehca', 'ipoib' and 'mlx4' into for-linus	2009-01-16 15:05:54 -08:00
input	input: PCF50633 input driver	2009-01-11 01:34:25 +01:00
isdn	isdn: Fix missing ifdef in isdn_ppp	2009-01-26 12:24:38 -08:00
leds	lis3lv02d: merge with leds hp disk	2009-01-15 16:39:40 -08:00
lguest	lguest: Fix a memory leak with the lg object during launcher close	2009-01-30 11:34:11 +10:30
macintosh	…
mca	…
md	…
media	V4L/DVB (10411): s5h1409: Perform s5h1409 soft reset after tuning	2009-02-01 10:41:02 -02:00
memstick	memstick: annotate endianness of attribute structs	2009-01-09 16:54:41 -08:00
message	[SCSI] mpt fusion: Add Firmware debug support	2009-01-13 10:36:02 -06:00
mfd	mfd: Remove non exported references from pcf50633	2009-01-15 11:50:58 +01:00
misc	sgi-xp: fix writing past the end of kzalloc()'d space	2009-02-05 12:56:49 -08:00
mmc	pxamci: enable DMA for write ops after CMD/RESP	2009-02-02 20:57:07 +01:00
mtd	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2009-02-03 16:52:10 -08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-02-04 07:52:21 -08:00
nubus	…
of	drivers/of: Add the of_find_i2c_device_by_node function.	2009-01-09 15:49:06 -07:00
oprofile	oprofile: fix uninitialized use of struct op_entry	2009-01-17 17:26:39 +01:00
parisc	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
parport	…
pci	PCI hotplug: Change link order of pciehp & acpiphp	2009-01-27 15:35:51 -08:00
pcmcia	powerpc: Change u64/s64 to a long long integer type	2009-01-13 14:47:59 +11:00
platform	hp-wmi: fix error path in hp_wmi_bios_setup()	2009-02-05 12:56:47 -08:00
pnp	…
power	power_supply: pda_power: Don't request shared IRQs w/ IRQF_DISABLED	2009-01-26 02:09:26 +03:00
ps3	powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3	2009-01-16 16:15:14 +11:00
rapidio	…
regulator	leds: Fix bounds checking of wm8350->pmic.led	2009-01-30 21:50:49 +00:00
rtc	rtc-ds1390: fix compilation warnings in drivers/rtc/rtc-ds1390.c	2009-02-05 12:56:48 -08:00
s390	lcs: fix compilation for !CONFIG_IP_MULTICAST	2009-01-25 17:59:26 -08:00
sbus	…
scsi	[SCSI] ibmvfc: Fix DMA mapping leak on memory allocation failure	2009-01-25 08:14:53 -06:00
serial	Add enable_ms to jsm driver	2009-01-30 08:40:54 -08:00
sh	…
sn	…
spi	spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom	2009-01-26 21:19:54 +01:00
ssb	…
staging	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
tc	…
telephony	…
thermal	…
uio	…
usb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream	2009-02-02 17:52:39 +00:00
uwb	uwb: lock rc->rsvs_lock with spin_lock_bh()	2009-01-23 12:57:20 +00:00
video	atyfb: fix CONFIG_ namespace violations	2009-02-05 12:56:48 -08:00
virtio	virtio-pci: do not oops on config change if driver not loaded	2009-02-02 19:17:56 -08:00
w1	…
watchdog	[ARM] omap: watchdog: allow OMAP watchdog driver on OMAP34xx platforms	2009-01-24 16:48:42 +00:00
xen	xen: make sysfs files behave as their names suggest	2009-01-29 13:20:36 +01:00
zorro	m68k: zorro - Use %pR to print resources	2009-01-12 20:56:43 +01:00
Kconfig	…
Makefile	Merge branch 'drivers-platform' into release	2009-01-09 04:56:56 -05:00