From: Subrata M. <su...@li...> - 2008-07-30 07:09:46
|
Hi James, On Tue, 2008-07-29 at 16:03 +1000, James Morris wrote: > The following patches have been merged with 2.6.27-rc1 and pushed to > > git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next Is this some sort of test framework/suite that you are maintaining just for LSM testing ? Regards-- Subrata > > which is pulled into the linux-next tree. > > I manually resolved a few merge conflicts in the Integrity/TPM code. It > needs to be tested. Mimi, please let me know if it's ok. > > Also, I modified the integrity_inode_permission hook to take a NULL > nameidata pointer as it is no longer passed to exec_permission_lite(). > > This is a temporary fix and needs to be resolved properly by either > removing the nameidata parameter from the hook and related code, or making > a case for it to be reinstated (added Al to the cc so he knows the > context if it comes up). > > > ---- > > Adrian Bunk (1): > make selinux_write_opts() static > > David Howells (1): > SELinux: Fix a potentially uninitialised variable in SELinux hooks > > James Morris (2): > integrity: fix up some atomic vs. atomic_long issues > Merge branch 'master' into devel > > Mimi Zohar (5): > integrity: TPM cleanup > integrity: TPM internel kernel interface > integrity: special fs magic > integrity: Linux Integrity Module(LIM) > integrity: IMA as an integrity service provider > > Vesa-Matti J Kari (2): > SELinux: Trivial minor fixes that change C null character style > SELinux: trivial, remove unneeded local variable > > > |