mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
![Sasha Levin](/assets/img/avatar_default.png)
I'm not sure why, but the hlist for each entry iterators were conceived list_for_each_entry(pos, head, member) The hlist ones were greedy and wanted an extra parameter: hlist_for_each_entry(tpos, pos, head, member) Why did they need an extra pos parameter? I'm not quite sure. Not only they don't really need it, it also prevents the iterator from looking exactly like the list iterator, which is unfortunate. Besides the semantic patch, there was some manual work required: - Fix up the actual hlist iterators in linux/list.h - Fix up the declaration of other iterators based on the hlist ones. - A very small amount of places were using the 'node' parameter, this was modified to use 'obj->member' instead. - Coccinelle didn't handle the hlist_for_each_entry_safe iterator properly, so those had to be fixed up manually. The semantic patch which is mostly the work of Peter Senna Tschudin is here: @@ iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host; type T; expression a,c,d,e; identifier b; statement S; @@ -T b; <+... when != b ( hlist_for_each_entry(a, - b, c, d) S | hlist_for_each_entry_continue(a, - b, c) S | hlist_for_each_entry_from(a, - b, c) S | hlist_for_each_entry_rcu(a, - b, c, d) S | hlist_for_each_entry_rcu_bh(a, - b, c, d) S | hlist_for_each_entry_continue_rcu_bh(a, - b, c) S | for_each_busy_worker(a, c, - b, d) S | ax25_uid_for_each(a, - b, c) S | ax25_for_each(a, - b, c) S | inet_bind_bucket_for_each(a, - b, c) S | sctp_for_each_hentry(a, - b, c) S | sk_for_each(a, - b, c) S | sk_for_each_rcu(a, - b, c) S | sk_for_each_from -(a, b) +(a) S + sk_for_each_from(a) S | sk_for_each_safe(a, - b, c, d) S | sk_for_each_bound(a, - b, c) S | hlist_for_each_entry_safe(a, - b, c, d, e) S | hlist_for_each_entry_continue_rcu(a, - b, c) S | nr_neigh_for_each(a, - b, c) S | nr_neigh_for_each_safe(a, - b, c, d) S | nr_node_for_each(a, - b, c) S | nr_node_for_each_safe(a, - b, c, d) S | - for_each_gfn_sp(a, c, d, b) S + for_each_gfn_sp(a, c, d) S | - for_each_gfn_indirect_valid_sp(a, c, d, b) S + for_each_gfn_indirect_valid_sp(a, c, d) S | for_each_host(a, - b, c) S | for_each_host_safe(a, - b, c, d) S | for_each_mesh_entry(a, - b, c, d) S ) ...+> [akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c] [akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c] [akpm@linux-foundation.org: checkpatch fixes] [akpm@linux-foundation.org: fix warnings] [akpm@linux-foudnation.org: redo intrusive kvm changes] Tested-by: Peter Senna Tschudin <peter.senna@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Cc: Wu Fengguang <fengguang.wu@intel.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Gleb Natapov <gleb@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
148 lines
3.9 KiB
C
148 lines
3.9 KiB
C
/*
|
|
* Copyright (C) 2005,2006,2007,2008 IBM Corporation
|
|
*
|
|
* Authors:
|
|
* Serge Hallyn <serue@us.ibm.com>
|
|
* Reiner Sailer <sailer@watson.ibm.com>
|
|
* Mimi Zohar <zohar@us.ibm.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation, version 2 of the
|
|
* License.
|
|
*
|
|
* File: ima_queue.c
|
|
* Implements queues that store template measurements and
|
|
* maintains aggregate over the stored measurements
|
|
* in the pre-configured TPM PCR (if available).
|
|
* The measurement list is append-only. No entry is
|
|
* ever removed or changed during the boot-cycle.
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <linux/rculist.h>
|
|
#include <linux/slab.h>
|
|
#include "ima.h"
|
|
|
|
#define AUDIT_CAUSE_LEN_MAX 32
|
|
|
|
LIST_HEAD(ima_measurements); /* list of all measurements */
|
|
|
|
/* key: inode (before secure-hashing a file) */
|
|
struct ima_h_table ima_htable = {
|
|
.len = ATOMIC_LONG_INIT(0),
|
|
.violations = ATOMIC_LONG_INIT(0),
|
|
.queue[0 ... IMA_MEASURE_HTABLE_SIZE - 1] = HLIST_HEAD_INIT
|
|
};
|
|
|
|
/* mutex protects atomicity of extending measurement list
|
|
* and extending the TPM PCR aggregate. Since tpm_extend can take
|
|
* long (and the tpm driver uses a mutex), we can't use the spinlock.
|
|
*/
|
|
static DEFINE_MUTEX(ima_extend_list_mutex);
|
|
|
|
/* lookup up the digest value in the hash table, and return the entry */
|
|
static struct ima_queue_entry *ima_lookup_digest_entry(u8 *digest_value)
|
|
{
|
|
struct ima_queue_entry *qe, *ret = NULL;
|
|
unsigned int key;
|
|
int rc;
|
|
|
|
key = ima_hash_key(digest_value);
|
|
rcu_read_lock();
|
|
hlist_for_each_entry_rcu(qe, &ima_htable.queue[key], hnext) {
|
|
rc = memcmp(qe->entry->digest, digest_value, IMA_DIGEST_SIZE);
|
|
if (rc == 0) {
|
|
ret = qe;
|
|
break;
|
|
}
|
|
}
|
|
rcu_read_unlock();
|
|
return ret;
|
|
}
|
|
|
|
/* ima_add_template_entry helper function:
|
|
* - Add template entry to measurement list and hash table.
|
|
*
|
|
* (Called with ima_extend_list_mutex held.)
|
|
*/
|
|
static int ima_add_digest_entry(struct ima_template_entry *entry)
|
|
{
|
|
struct ima_queue_entry *qe;
|
|
unsigned int key;
|
|
|
|
qe = kmalloc(sizeof(*qe), GFP_KERNEL);
|
|
if (qe == NULL) {
|
|
pr_err("IMA: OUT OF MEMORY ERROR creating queue entry.\n");
|
|
return -ENOMEM;
|
|
}
|
|
qe->entry = entry;
|
|
|
|
INIT_LIST_HEAD(&qe->later);
|
|
list_add_tail_rcu(&qe->later, &ima_measurements);
|
|
|
|
atomic_long_inc(&ima_htable.len);
|
|
key = ima_hash_key(entry->digest);
|
|
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
|
|
return 0;
|
|
}
|
|
|
|
static int ima_pcr_extend(const u8 *hash)
|
|
{
|
|
int result = 0;
|
|
|
|
if (!ima_used_chip)
|
|
return result;
|
|
|
|
result = tpm_pcr_extend(TPM_ANY_NUM, CONFIG_IMA_MEASURE_PCR_IDX, hash);
|
|
if (result != 0)
|
|
pr_err("IMA: Error Communicating to TPM chip, result: %d\n",
|
|
result);
|
|
return result;
|
|
}
|
|
|
|
/* Add template entry to the measurement list and hash table,
|
|
* and extend the pcr.
|
|
*/
|
|
int ima_add_template_entry(struct ima_template_entry *entry, int violation,
|
|
const char *op, struct inode *inode)
|
|
{
|
|
u8 digest[IMA_DIGEST_SIZE];
|
|
const char *audit_cause = "hash_added";
|
|
char tpm_audit_cause[AUDIT_CAUSE_LEN_MAX];
|
|
int audit_info = 1;
|
|
int result = 0, tpmresult = 0;
|
|
|
|
mutex_lock(&ima_extend_list_mutex);
|
|
if (!violation) {
|
|
memcpy(digest, entry->digest, sizeof digest);
|
|
if (ima_lookup_digest_entry(digest)) {
|
|
audit_cause = "hash_exists";
|
|
result = -EEXIST;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
result = ima_add_digest_entry(entry);
|
|
if (result < 0) {
|
|
audit_cause = "ENOMEM";
|
|
audit_info = 0;
|
|
goto out;
|
|
}
|
|
|
|
if (violation) /* invalidate pcr */
|
|
memset(digest, 0xff, sizeof digest);
|
|
|
|
tpmresult = ima_pcr_extend(digest);
|
|
if (tpmresult != 0) {
|
|
snprintf(tpm_audit_cause, AUDIT_CAUSE_LEN_MAX, "TPM_error(%d)",
|
|
tpmresult);
|
|
audit_cause = tpm_audit_cause;
|
|
audit_info = 0;
|
|
}
|
|
out:
|
|
mutex_unlock(&ima_extend_list_mutex);
|
|
integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode,
|
|
entry->template.file_name,
|
|
op, audit_cause, result, audit_info);
|
|
return result;
|
|
}
|