| #
95fd4845 |
| 11-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc4' into perfcounters/core
Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c
|
| #
d9f8e9c3 |
| 09-Feb-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/quirk-cleanup' into topic/misc
|
| #
2a074f4a |
| 09-Feb-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/quirk-cleanup' into topic/hda
|
|
Revision tags: v2.6.29-rc4 |
|
| #
140573d3 |
| 08-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'sched/rt' and 'sched/urgent' into sched/core
|
| #
673f8205 |
| 07-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
|
| #
2d29c6a0 |
| 07-Feb-2009 |
Len Brown <len.brown@intel.com> |
Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
|
| #
0464ac9e |
| 06-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
|
| #
cb5629b1 |
| 06-Feb-2009 |
James Morris <jmorris@namei.org> |
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 @@@ stat
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>
show more ...
|
| #
bb960a1e |
| 04-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'core/xen' into x86/urgent
|
| #
6d2160bf |
| 03-Feb-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
| #
b3ff29d2 |
| 03-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
|
| #
fb53fde9 |
| 03-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
dc573f9b |
| 03-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core
|
| #
8db0c5d5 |
| 02-Feb-2009 |
Dave Kleikamp <shaggy@linux.vnet.ibm.com> |
Merge branch 'master' of /home/shaggy/git/linus-clean/
|
| #
8f049155 |
| 02-Feb-2009 |
David Vrabel <david.vrabel@csr.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
|
| #
de869620 |
| 01-Feb-2009 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
|
| #
9b7ed8fa |
| 30-Jan-2009 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge branch 'core/percpu' into x86/paravirt
|
| #
c43e0e46 |
| 30-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
|
| #
a1a1415e |
| 29-Jan-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
e4e3c3f1 |
| 29-Jan-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
|
Revision tags: v2.6.29-rc3 |
|
| #
c4568d6c |
| 28-Jan-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Fix handling of _PAGE_COHERE
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/mm: Fix handling of _PAGE_COHERENT in BAT setup code
powerpc/pseries: Correct VIO bus accounting problem in CMO env.
powerpc: More printing warning fixes for the l64 to ll64 conversion
powerpc: Remove arch/ppc cruft from Kconfig
powerpc: Printing fix for l64 to ll64 conversion: phyp_dump.c
powerpc/embedded6xx: Update defconfigs
powerpc/8xx: Update defconfigs
powerpc/86xx: Update defconfigs
powerpc/83xx: Update defconfigs
powerpc/85xx: Update defconfigs
powerpc/mpc8313erdb: fix kernel panic because mdio device is not probed
powerpc/4xx: Update multi-board PowerPC 4xx defconfigs
powerpc/44x: Update PowerPC 44x defconfigs
powerpc/40x: Update PowerPC 40x defconfigs
powerpc/85xx: Fix typo in mpc8572ds dts
powerpc/44x: Warp patches for the new NDFC driver
powerpc/4xx: DTS: Add Add'l SDRAM0 Compatible and Interrupt Info
show more ...
|
| #
0411648e |
| 28-Jan-2009 |
Benjamin Herrenschmidt <benh@kernel.crashing.org> |
Merge commit 'kumar/kumar-merge' into merge
|
| #
aaca4ff0 |
| 27-Jan-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
3ddeb51d |
| 27-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/kernel/setup_percpu.c
|
| #
47b193a1 |
| 27-Jan-2009 |
Kumar Gala <galak@kernel.crashing.org> |
powerpc/83xx: Update defconfigs
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
|