|
Revision tags: v2.6.29-rc8 |
|
| #
d95c3578 |
| 11-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/core' into cpus4096
|
| #
efdcd41b |
| 09-Mar-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/vmaster-update' into topic/docbook-fix
|
| #
abcea2c3 |
| 09-Mar-2009 |
Eric Miao <eric.miao@marvell.com> |
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
|
| #
d15c22e7 |
| 09-Mar-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.29-rc7' into next
|
| #
7df4edb0 |
| 05-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
|
|
Revision tags: v2.6.29-rc7 |
|
| #
c02368a9 |
| 02-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|
| #
2e31add2 |
| 25-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/urgent' into x86/pat
|
| #
467388f2 |
| 24-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
dc731ca6 |
| 23-Feb-2009 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge branch 'x86/urgent' into x86/mce2
|
|
Revision tags: v2.6.29-rc6 |
|
| #
2702e0a4 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
|
Revision tags: v2.6.29-rc5 |
|
| #
f8a6b2b9 |
| 13-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
|
| #
871cafcc |
| 12-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softlockup
|
| #
41480ae7 |
| 12-Feb-2009 |
Paul Mundt <lethal@linux-sh.org> |
Merge branch 'sh/stable-updates'
|
| #
89139374 |
| 11-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc4' into x86/cleanups
|
| #
f437e8b5 |
| 11-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc4' into sched/core
|
| #
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
|
| #
d41d4113 |
| 09-Feb-2009 |
Felix Blyakher <felixb@sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
249d51b5 |
| 09-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc4' into core/percpu
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
|
|
Revision tags: v2.6.29-rc4 |
|
| #
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 ...
|
| #
43769f10 |
| 05-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
|
| #
005c79b3 |
| 05-Feb-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
|
| #
024bb961 |
| 04-Feb-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Kill bogus TPC/address truncation during 32-bit faults
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Kill bogus TPC/address truncation during 32-bit faults.
sparc: fixup for sparseirq changes
sparc64: Validate kernel generated fault addresses on sparc64.
sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode.
sparc64: Implement NMI watchdog on capable cpus.
sparc: Probe PMU type and record in sparc_pmu_type.
sparc64: Move generic PCR support code to seperate file.
show more ...
|