|
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 |
| 05-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
|
| #
dc573f9b |
| 02-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
|
| #
9b7ed8fa |
| 30-Jan-2009 |
H. Peter Anvin <hpa@linux.intel.com> |
Merge branch 'core/percpu' into x86/paravirt
|
|
Revision tags: v2.6.29-rc3 |
|
| #
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
|
| #
3eacdf58 |
| 26-Jan-2009 |
David S. Miller <davem@davemloft.net> |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
|
| #
2034563c |
| 26-Jan-2009 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: fix kbuild.txt typos
kbuild: print usage with no ar
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: fix kbuild.txt typos
kbuild: print usage with no arguments in scripts/config
Revert "kbuild: strip generated symbols from *.ko"
show more ...
|
| #
dff243f7 |
| 22-Jan-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
|
| #
b2b062b8 |
| 18-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'core/percpu' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-of
Merge branch 'core/percpu' into stackprotector
Conflicts:
arch/x86/include/asm/pda.h
arch/x86/include/asm/system.h
Also, moved include/asm-x86/stackprotector.h to arch/x86/include/asm.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
show more ...
|
| #
d1a02005 |
| 17-Jan-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
|
|
Revision tags: v2.6.29-rc2 |
|
| #
5a2dd72a |
| 16-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|
| #
c0106d72 |
| 15-Jan-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/asoc' into next/asoc
|
|
Revision tags: v2.6.29-rc1 |
|
| #
2302e873 |
| 07-Jan-2009 |
Andi Kleen <andi@firstfloor.org> |
kbuild: print usage with no arguments in scripts/config
Requested by Sam.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
|
| #
e3ee1e12 |
| 12-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into timers/hrtimers
Conflicts:
kernel/time/tick-common.c
|
| #
d19b85db |
| 11-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into timers/urgent
|
| #
e8b722f4 |
| 10-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into irq/urgent
|
| #
99cd7074 |
| 10-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into tracing/urgent
|