All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <20191106190116.2578-6-nramas@linux.microsoft.com>

diff --git a/a/1.txt b/N1/1.txt
index 335bdfd..373d33e 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 a0e233afe876..b6d17f37ba61 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 ece1419..5d3c90d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH v4 05/10] IMA: Updated IMA policy functions to return keyrings option read from the policy\0"
 ]
 [
-  "Date\0Wed, 06 Nov 2019 19:01:11 +0000\0"
+  "Date\0Wed,  6 Nov 2019 11:01:11 -0800\0"
 ]
 [
   "To\0zohar\@linux.ibm.com",
@@ -73,9 +73,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",
@@ -123,7 +127,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",
@@ -179,4 +183,4 @@
   "2.17.1"
 ]
 
-d65bceeeec3b7d4f8dab6a8a5633d16dfb285928ad198b47b5be69f89980a394
+0d85a2a46753272404961de252fbed07454e923f4f4057821dfe97b45d8f32f1
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.