| #
3a20ac2c |
| 04-May-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
|
| #
6967963d |
| 14-Apr-2009 |
Mark Brown <broonie@opensource.wolfsonmicro.com> |
Merge branch 'for-2.6.30' into for-2.6.31
|
| #
18ffa418 |
| 26-Mar-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29' into x86/setup-lzma
|
| #
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
|
| #
d15c22e7 |
| 08-Mar-2009 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge commit 'v2.6.29-rc7' into next
|
| #
66a101dd |
| 23-Feb-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
|
| #
2702e0a4 |
| 22-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into timers/hpet
|
| #
871cafcc |
| 12-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into core/softlockup
|
| #
89139374 |
| 11-Feb-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc4' into x86/cleanups
|
| #
2a074f4a |
| 09-Feb-2009 |
Takashi Iwai <tiwai@suse.de> |
Merge branch 'topic/quirk-cleanup' into topic/hda
|
| #
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
|
| #
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
|
| #
8db0c5d5 |
| 02-Feb-2009 |
Dave Kleikamp <shaggy@linux.vnet.ibm.com> |
Merge branch 'master' of /home/shaggy/git/linus-clean/
|
| #
5b74f9e0 |
| 25-Jan-2009 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into timers/hrtimers
|
| #
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
|
| #
6552ebae |
| 22-Jan-2009 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'core/debugobjects' into core/urgent
|
| #
77835492 |
| 21-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
|
| #
19803078 |
| 21-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
|
| #
0ce1c383 |
| 20-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge commit 'v2.6.29-rc2' into x86/mm
|
| #
6c5200ce |
| 19-Jan-2009 |
Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
4092762a |
| 18-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
|
| #
5a2dd72a |
| 16-Jan-2009 |
Ingo Molnar <mingo@elte.hu> |
Merge branch 'linus' into irq/genirq
|