diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/ima/ima_fs.c | 4 | ||||
-rw-r--r-- | security/smack/smackfs.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index 7039b14e1f73..6bfc7eaebfda 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c | |||
@@ -85,8 +85,8 @@ static void *ima_measurements_next(struct seq_file *m, void *v, loff_t *pos) | |||
85 | * against concurrent list-extension | 85 | * against concurrent list-extension |
86 | */ | 86 | */ |
87 | rcu_read_lock(); | 87 | rcu_read_lock(); |
88 | qe = list_entry(rcu_dereference(qe->later.next), | 88 | qe = list_entry_rcu(qe->later.next, |
89 | struct ima_queue_entry, later); | 89 | struct ima_queue_entry, later); |
90 | rcu_read_unlock(); | 90 | rcu_read_unlock(); |
91 | (*pos)++; | 91 | (*pos)++; |
92 | 92 | ||
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 8d3c2a051c7b..f83a80980726 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c | |||
@@ -735,8 +735,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new) | |||
735 | return; | 735 | return; |
736 | } | 736 | } |
737 | 737 | ||
738 | m = list_entry(rcu_dereference(smk_netlbladdr_list.next), | 738 | m = list_entry_rcu(smk_netlbladdr_list.next, |
739 | struct smk_netlbladdr, list); | 739 | struct smk_netlbladdr, list); |
740 | 740 | ||
741 | /* the comparison '>' is a bit hacky, but works */ | 741 | /* the comparison '>' is a bit hacky, but works */ |
742 | if (new->smk_mask.s_addr > m->smk_mask.s_addr) { | 742 | if (new->smk_mask.s_addr > m->smk_mask.s_addr) { |
@@ -749,8 +749,8 @@ static void smk_netlbladdr_insert(struct smk_netlbladdr *new) | |||
749 | list_add_rcu(&new->list, &m->list); | 749 | list_add_rcu(&new->list, &m->list); |
750 | return; | 750 | return; |
751 | } | 751 | } |
752 | m_next = list_entry(rcu_dereference(m->list.next), | 752 | m_next = list_entry_rcu(m->list.next, |
753 | struct smk_netlbladdr, list); | 753 | struct smk_netlbladdr, list); |
754 | if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) { | 754 | if (new->smk_mask.s_addr > m_next->smk_mask.s_addr) { |
755 | list_add_rcu(&new->list, &m->list); | 755 | list_add_rcu(&new->list, &m->list); |
756 | return; | 756 | return; |