Skip to content

Commit d158847

Browse files
Mimi Zohartorvalds
authored andcommitted
ima: maintain memory size needed for serializing the measurement list
In preparation for serializing the binary_runtime_measurements, this patch maintains the amount of memory required. Link: http://lkml.kernel.org/r/1480554346-29071-5-git-send-email-zohar@linux.vnet.ibm.com Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Acked-by: Dmitry Kasatkin <dmitry.kasatkin@gmail.com> Cc: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Andreas Steffen <andreas.steffen@strongswan.org> Cc: Josh Sklar <sklar@linux.vnet.ibm.com> Cc: Dave Young <dyoung@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Baoquan He <bhe@redhat.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Stewart Smith <stewart@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent dcfc569 commit d158847

File tree

3 files changed

+64
-2
lines changed

3 files changed

+64
-2
lines changed

security/integrity/ima/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ config IMA
2727
to learn more about IMA.
2828
If unsure, say N.
2929

30+
config IMA_KEXEC
31+
bool "Enable carrying the IMA measurement list across a soft boot"
32+
depends on IMA && TCG_TPM && HAVE_IMA_KEXEC
33+
default n
34+
help
35+
TPM PCRs are only reset on a hard reboot. In order to validate
36+
a TPM's quote after a soft boot, the IMA measurement list of the
37+
running kernel must be saved and restored on boot.
38+
39+
Depending on the IMA policy, the measurement list can grow to
40+
be very large.
41+
3042
config IMA_MEASURE_PCR_IDX
3143
int
3244
depends on IMA

security/integrity/ima/ima.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ void ima_print_digest(struct seq_file *m, u8 *digest, u32 size);
143143
struct ima_template_desc *ima_template_desc_current(void);
144144
int ima_restore_measurement_entry(struct ima_template_entry *entry);
145145
int ima_restore_measurement_list(loff_t bufsize, void *buf);
146+
unsigned long ima_get_binary_runtime_size(void);
146147
int ima_init_template(void);
147148

148149
/*

security/integrity/ima/ima_queue.c

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
#define AUDIT_CAUSE_LEN_MAX 32
3030

3131
LIST_HEAD(ima_measurements); /* list of all measurements */
32+
#ifdef CONFIG_IMA_KEXEC
33+
static unsigned long binary_runtime_size;
34+
#else
35+
static unsigned long binary_runtime_size = ULONG_MAX;
36+
#endif
3237

3338
/* key: inode (before secure-hashing a file) */
3439
struct ima_h_table ima_htable = {
@@ -64,6 +69,24 @@ static struct ima_queue_entry *ima_lookup_digest_entry(u8 *digest_value,
6469
return ret;
6570
}
6671

72+
/*
73+
* Calculate the memory required for serializing a single
74+
* binary_runtime_measurement list entry, which contains a
75+
* couple of variable length fields (e.g template name and data).
76+
*/
77+
static int get_binary_runtime_size(struct ima_template_entry *entry)
78+
{
79+
int size = 0;
80+
81+
size += sizeof(u32); /* pcr */
82+
size += sizeof(entry->digest);
83+
size += sizeof(int); /* template name size field */
84+
size += strlen(entry->template_desc->name) + 1;
85+
size += sizeof(entry->template_data_len);
86+
size += entry->template_data_len;
87+
return size;
88+
}
89+
6790
/* ima_add_template_entry helper function:
6891
* - Add template entry to the measurement list and hash table, for
6992
* all entries except those carried across kexec.
@@ -91,9 +114,30 @@ static int ima_add_digest_entry(struct ima_template_entry *entry,
91114
key = ima_hash_key(entry->digest);
92115
hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
93116
}
117+
118+
if (binary_runtime_size != ULONG_MAX) {
119+
int size;
120+
121+
size = get_binary_runtime_size(entry);
122+
binary_runtime_size = (binary_runtime_size < ULONG_MAX - size) ?
123+
binary_runtime_size + size : ULONG_MAX;
124+
}
94125
return 0;
95126
}
96127

128+
/*
129+
* Return the amount of memory required for serializing the
130+
* entire binary_runtime_measurement list, including the ima_kexec_hdr
131+
* structure.
132+
*/
133+
unsigned long ima_get_binary_runtime_size(void)
134+
{
135+
if (binary_runtime_size >= (ULONG_MAX - sizeof(struct ima_kexec_hdr)))
136+
return ULONG_MAX;
137+
else
138+
return binary_runtime_size + sizeof(struct ima_kexec_hdr);
139+
};
140+
97141
static int ima_pcr_extend(const u8 *hash, int pcr)
98142
{
99143
int result = 0;
@@ -107,8 +151,13 @@ static int ima_pcr_extend(const u8 *hash, int pcr)
107151
return result;
108152
}
109153

110-
/* Add template entry to the measurement list and hash table,
111-
* and extend the pcr.
154+
/*
155+
* Add template entry to the measurement list and hash table, and
156+
* extend the pcr.
157+
*
158+
* On systems which support carrying the IMA measurement list across
159+
* kexec, maintain the total memory size required for serializing the
160+
* binary_runtime_measurements.
112161
*/
113162
int ima_add_template_entry(struct ima_template_entry *entry, int violation,
114163
const char *op, struct inode *inode,

0 commit comments

Comments
 (0)