diff for duplicates of <20191111193303.12781-5-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index f5caaa9..eaa5bbc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,9 +43,13 @@ index 610759fe63b8..fa2cd71ddf1a 100644 +++ b/security/integrity/ima/ima_api.c @@ -169,12 +169,13 @@ void ima_add_violation(struct file *file, const unsigned char *filename, * @func: caller identifier - * @pcr: pointer filled in if matched measure policy sets pcr * @template_desc: pointer filled in if matched measure policy sets template+ * @keyrings: pointer filled in if matched measure policy sets keyrings * + * @pcr: pointer filled in if matched measure policy sets pcr= + * @template_desc: pointer filled in if matched measure policy sets template= ++ * @keyrings: pointer filled in if matched measure policy sets keyrings= + * * The policy is defined in terms of keypairs: - * subj=, obj=, type=, func=, mask=, fsmagic * subj,obj, and type: are LSM specific. + * subj=, obj=, type=, func=, mask=, fsmagic= + * subj,obj, and type: are LSM specific. * func: FILE_CHECK | BPRM_CHECK | CREDS_CHECK | MMAP_CHECK | MODULE_CHECK - * | KEXEC_CMDLINE + * | KEXEC_CMDLINE | KEYRING_CHECK @@ -93,7 +97,7 @@ index d7e987baf127..68e15ff1fe8d 100644 action = ima_get_action(inode, cred, secid, mask, func, &pcr, - &template_desc); + &template_desc, NULL); - violation_check = ((func = FILE_CHECK || func = MMAP_CHECK) && + violation_check = ((func == FILE_CHECK || func == MMAP_CHECK) && (ima_policy_flag & IMA_MEASURE)); if (!action && !violation_check) @@ -647,6 +647,7 @@ void process_buffer_measurement(const void *buf, int size, diff --git a/a/content_digest b/N1/content_digest index 5112766..e9265c2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191111193303.12781-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" "Subject\0[PATCH v5 04/10] IMA: Updated IMA policy functions to return keyrings option read from the policy\0" - "Date\0Mon, 11 Nov 2019 19:32:57 +0000\0" + "Date\0Mon, 11 Nov 2019 11:32:57 -0800\0" "To\0zohar@linux.ibm.com" dhowells@redhat.com matthewgarrett@google.com @@ -58,9 +58,13 @@ "+++ b/security/integrity/ima/ima_api.c\n" "@@ -169,12 +169,13 @@ void ima_add_violation(struct file *file, const unsigned char *filename,\n" " * @func: caller identifier\n" - " * @pcr: pointer filled in if matched measure policy sets pcr * @template_desc: pointer filled in if matched measure policy sets template+ * @keyrings: pointer filled in if matched measure policy sets keyrings *\n" + " * @pcr: pointer filled in if matched measure policy sets pcr=\n" + " * @template_desc: pointer filled in if matched measure policy sets template=\n" + "+ * @keyrings: pointer filled in if matched measure policy sets keyrings=\n" + " *\n" " * The policy is defined in terms of keypairs:\n" - " *\t\tsubj=, obj=, type=, func=, mask=, fsmagic *\tsubj,obj, and type: are LSM specific.\n" + " *\t\tsubj=, obj=, type=, func=, mask=, fsmagic=\n" + " *\tsubj,obj, and type: are LSM specific.\n" " *\tfunc: FILE_CHECK | BPRM_CHECK | CREDS_CHECK | MMAP_CHECK | MODULE_CHECK\n" "- *\t| KEXEC_CMDLINE\n" "+ *\t| KEXEC_CMDLINE | KEYRING_CHECK\n" @@ -108,7 +112,7 @@ " \taction = ima_get_action(inode, cred, secid, mask, func, &pcr,\n" "-\t\t\t\t&template_desc);\n" "+\t\t\t\t&template_desc, NULL);\n" - " \tviolation_check = ((func = FILE_CHECK || func = MMAP_CHECK) &&\n" + " \tviolation_check = ((func == FILE_CHECK || func == MMAP_CHECK) &&\n" " \t\t\t (ima_policy_flag & IMA_MEASURE));\n" " \tif (!action && !violation_check)\n" "@@ -647,6 +647,7 @@ void process_buffer_measurement(const void *buf, int size,\n" @@ -163,4 +167,4 @@ "-- \n" 2.17.1 -bc453975d0b21d51cca9e58e5491ded3d39c1ebf5d03cd92bf1b9f58f950ad1b +1b993d5a4ae98876e9f2aa577e096460657db7bdf31d49b880e76d967b5fadde
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.