| #
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 ...
|
| #
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
|
| #
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
|
| #
cb7a97d0 |
| 14-Jan-2009 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
|
| #
c088f4e9 |
| 14-Jan-2009 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
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 |
| 11-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into irq/urgent
|
| #
99cd7074 |
| 11-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into tracing/urgent
|
| #
abede81c |
| 11-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into core/urgent
|
| #
f45ac22a |
| 11-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into x86/urgent
|
| #
506c10f2 |
| 11-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
|
| #
0811a433 |
| 10-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/iommu
|
| #
1de8cd3c |
| 10-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/cleanups
|
| #
b1730424 |
| 10-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
|
| #
b2576e1d |
| 09-Jan-2009 |
Len Brown <len.brown@intel.com> |
Merge branch 'linus' into release
|
| #
b53907c0 |
| 08-Jan-2009 |
Wu Fengguang <fengguang.wu@intel.com> |
generic swap(): lib/sort.c: rename swap to swap_func
This is to avoid name clashes for the introduction of a global swap()
macro.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by:
generic swap(): lib/sort.c: rename swap to swap_func
This is to avoid name clashes for the introduction of a global swap()
macro.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
995e4286 |
| 17-Oct-2007 |
Subbaiah Venkata <kvsnaidu@sapnaidu.net> |
lib/sort.c optimization
Hello, I fixed and tested a small bug in lib/sort.c file, heap sort
function.
The fix avoids unnecessary swap of contents when i is 0 (saves few loads
and stores), which hap
lib/sort.c optimization
Hello, I fixed and tested a small bug in lib/sort.c file, heap sort
function.
The fix avoids unnecessary swap of contents when i is 0 (saves few loads
and stores), which happens every time sort function is called. I felt the
fix is worth bringing it to your attention given the importance and
frequent use of the sort function.
Acked-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
5a84d159 |
| 20-Feb-2007 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge ARM fixes
|
| #
48c871c1 |
| 17-Feb-2007 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
|
| #
d9bc125c |
| 13-Feb-2007 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix con
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
show more ...
|
| #
54c66f6d |
| 13-Feb-2007 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master' into 85xx
|