diff for duplicates of <1496748819.5546.42.camel@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index ae71a64..4db6254 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,21 +1,21 @@ On Tue, 2017-06-06 at 11:13 +0200, Roberto Sassu wrote: -> >>? /* returns pointer to hlist_node */ -> >>? static void *ima_measurements_start(struct seq_file *m, loff_t *pos) -> >>? { -> >>??????loff_t l = *pos; -> >>??????struct ima_queue_entry *qe; -> >> +????struct ima_queue_entry *qe_found = NULL; -> >> +????unsigned long size = 0, count = 0; -> >> +????bool khdr = m->file->f_path.dentry == binary_kexec_runtime_measurements; +> >> /* returns pointer to hlist_node */ +> >> static void *ima_measurements_start(struct seq_file *m, loff_t *pos) +> >> { +> >> loff_t l = *pos; +> >> struct ima_queue_entry *qe; +> >> + struct ima_queue_entry *qe_found = NULL; +> >> + unsigned long size = 0, count = 0; +> >> + bool khdr = m->file->f_path.dentry == binary_kexec_runtime_measurements; > >> -> >>??????/* we need a lock since pos could point beyond last element */ -> >>??????rcu_read_lock(); -> >>??????list_for_each_entry_rcu(qe, &ima_measurements, later) { -> >> -????????????if (!l--) { -> >> -????????????????????rcu_read_unlock(); -> >> -????????????????????return qe; -> >> +????????????if (!l) { -> >> +????????????????????qe_found = qe_found ? qe_found : qe; +> >> /* we need a lock since pos could point beyond last element */ +> >> rcu_read_lock(); +> >> list_for_each_entry_rcu(qe, &ima_measurements, later) { +> >> - if (!l--) { +> >> - rcu_read_unlock(); +> >> - return qe; +> >> + if (!l) { +> >> + qe_found = qe_found ? qe_found : qe; > > > > What is this? > @@ -28,8 +28,8 @@ Wouldn't a simple if/then be more appropriate here? > > > > >> + -> >> +????????????????????if (!khdr) -> >> +????????????????????????????break; +> >> + if (!khdr) +> >> + break; > > > > Does this test need to be in the loop? > @@ -42,8 +42,3 @@ before returning. thanks, Mimi - --- -To unsubscribe from this list: send the line "unsubscribe linux-security-module" in -the body of a message to majordomo at vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index ce97000..bd90ff4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,30 +2,33 @@ "ref\020170516125347.10574-6-roberto.sassu@huawei.com\0" "ref\01496642698.2998.104.camel@linux.vnet.ibm.com\0" "ref\025671f22-7145-6ff3-40c0-a27665443a2c@huawei.com\0" - "From\0zohar@linux.vnet.ibm.com (Mimi Zohar)\0" - "Subject\0[Linux-ima-devel] [PATCH 5/7] ima: add securityfs interface to save a measurements list with kexec header\0" + "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" + "Subject\0Re: [Linux-ima-devel] [PATCH 5/7] ima: add securityfs interface to save a measurements list with kexec header\0" "Date\0Tue, 06 Jun 2017 07:33:39 -0400\0" - "To\0linux-security-module@vger.kernel.org\0" + "To\0Roberto Sassu <roberto.sassu@huawei.com>" + " linux-ima-devel@lists.sourceforge.net\0" + "Cc\0linux-security-module@vger.kernel.org" + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, 2017-06-06 at 11:13 +0200, Roberto Sassu wrote:\n" - "> >>? /* returns pointer to hlist_node */\n" - "> >>? static void *ima_measurements_start(struct seq_file *m, loff_t *pos)\n" - "> >>? {\n" - "> >>??????loff_t l = *pos;\n" - "> >>??????struct ima_queue_entry *qe;\n" - "> >> +????struct ima_queue_entry *qe_found = NULL;\n" - "> >> +????unsigned long size = 0, count = 0;\n" - "> >> +????bool khdr = m->file->f_path.dentry == binary_kexec_runtime_measurements;\n" + "> >>\302\240 /* returns pointer to hlist_node */\n" + "> >>\302\240 static void *ima_measurements_start(struct seq_file *m, loff_t *pos)\n" + "> >>\302\240 {\n" + "> >>\302\240\302\240\302\240\302\240\302\240\302\240loff_t l = *pos;\n" + "> >>\302\240\302\240\302\240\302\240\302\240\302\240struct ima_queue_entry *qe;\n" + "> >> +\302\240\302\240\302\240\302\240struct ima_queue_entry *qe_found = NULL;\n" + "> >> +\302\240\302\240\302\240\302\240unsigned long size = 0, count = 0;\n" + "> >> +\302\240\302\240\302\240\302\240bool khdr = m->file->f_path.dentry == binary_kexec_runtime_measurements;\n" "> >>\n" - "> >>??????/* we need a lock since pos could point beyond last element */\n" - "> >>??????rcu_read_lock();\n" - "> >>??????list_for_each_entry_rcu(qe, &ima_measurements, later) {\n" - "> >> -????????????if (!l--) {\n" - "> >> -????????????????????rcu_read_unlock();\n" - "> >> -????????????????????return qe;\n" - "> >> +????????????if (!l) {\n" - "> >> +????????????????????qe_found = qe_found ? qe_found : qe;\n" + "> >>\302\240\302\240\302\240\302\240\302\240\302\240/* we need a lock since pos could point beyond last element */\n" + "> >>\302\240\302\240\302\240\302\240\302\240\302\240rcu_read_lock();\n" + "> >>\302\240\302\240\302\240\302\240\302\240\302\240list_for_each_entry_rcu(qe, &ima_measurements, later) {\n" + "> >> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!l--) {\n" + "> >> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240rcu_read_unlock();\n" + "> >> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return qe;\n" + "> >> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!l) {\n" + "> >> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240qe_found = qe_found ? qe_found : qe;\n" "> >\n" "> > What is this?\n" "> \n" @@ -38,8 +41,8 @@ "> \n" "> >\n" "> >> +\n" - "> >> +????????????????????if (!khdr)\n" - "> >> +????????????????????????????break;\n" + "> >> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!khdr)\n" + "> >> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240break;\n" "> >\n" "> > Does this test need to be in the loop?\n" "> \n" @@ -51,11 +54,6 @@ "\n" "thanks,\n" "\n" - "Mimi\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" - "the body of a message to majordomo at vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Mimi -82cd3af83d6de8249a315bd8f696c764f696dce8b5abb38075254ac68bb7056b +2fd67e9d502e5e514548298e1896228792a60404a4d3666df76b74fd119cc82d
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.