Messages in this thread | | | Date | Mon, 21 Jan 2013 15:30:02 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the security tree with Linus' tree |
| |
Hi Mimi,
On Sun, 20 Jan 2013 22:10:23 -0500 Mimi Zohar <zohar@linux.vnet.ibm.com> wrote: > > Sorry Stephen, the merged result should look like what's contained in > linux-integrity/next-upstreamed-patches: > > int ima_module_check(struct file *file) > { > if (!file) { > if ((ima_appraise & IMA_APPRAISE_MODULES) && > (ima_appraise & IMA_APPRAISE_ENFORCE)) { > #ifndef CONFIG_MODULE_SIG_FORCE > return -EACCES; /* INTEGRITY_UNKNOWN */ > #endif > } > return 0; > } > return process_measurement(file, file->f_dentry->d_name.name, > MAY_EXEC, MODULE_CHECK); > }
OK, I will use that version tomorrow.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |