aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_fs.c4
-rw-r--r--security/smack/smackfs.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index ffbe259700b1..510186f0b72e 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -84,8 +84,8 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos)
84 * against concurrent list-extension 84 * against concurrent list-extension
85 */ 85 */
86 rcu_read_lock(); 86 rcu_read_lock();
87 qe = list_entry(rcu_dereference(qe->later.next), 87 qe = list_entry_rcu(qe->later.next,
88 struct ima_queue_entry, later); 88 struct ima_queue_entry, later);
89 rcu_read_unlock(); 89 rcu_read_unlock();
90 (*pos)++; 90 (*pos)++;
91 91
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
index e03a7e19c73b..11d2cb19d7a6 100644
--- a/security/smack/smackfs.c
+++ b/security/smack/smackfs.c
@@ -734,8 +734,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
734 return; 734 return;
735 } 735 }
736 736
737 m = list_entry(rcu_dereference(smk_netlbladdr_list.next), 737 m = list_entry_rcu(smk_netlbladdr_list.next,
738 struct smk_netlbladdr, list); 738 struct smk_netlbladdr, list);
739 739
740 /* the comparison '>' is a bit hacky, but works */ 740 /* the comparison '>' is a bit hacky, but works */
741 if (new->smk_mask.s_addr > m->smk_mask.s_addr) { 741 if (new->smk_mask.s_addr > m->smk_mask.s_addr) {
@@ -748,8 +748,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new)
748 list_add_rcu(&new->list, &m->list); 748 list_add_rcu(&new->list, &m->list);
749 return; 749 return;
750 } 750 }
751 m_next = list_entry(rcu_dereference(m->list.next), 751 m_next = list_entry_rcu(m->list.next,
752 struct smk_netlbladdr, list); 752 struct smk_netlbladdr, list);
753 if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) { 753 if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) {
754 list_add_rcu(&new->list, &m->list); 754 list_add_rcu(&new->list, &m->list);
755 return; 755 return;