Add support for measuring the boot command line during kexec_file_load
Subsystems (6)
v10 cover Add support for measuring the boot command line during kexec_file_load
The kexec boot command line arguments are not currently being measured.
Currently during soft reboot(kexec)
- the PCRS are not reset
- the command line arguments used for the next kernel are not measured.
This gives the impression to the secure boot attestation that a cold boot took place.
For secure boot attestation, it is necessary to measure the kernel command line. For cold boot, the boot loader can be enhanced to measure these parameters.
(https://mjg59.dreamwidth.org/48897.html)
This patch set aims to address measuring the boot command line during soft reboot(kexec_file_load).
To achive the above the patch series does the following
-Add a new ima hook: ima_kexec_cmdline which measures the cmdline args
into the ima log, behind a new ima policy entry KEXEC_CMDLINE. The kexec cmdline hash is stored in the "d-ng" field of the template data.
-Since the cmldine args cannot be appraised, a new template field(buf) is
added. The template field contains the buffer passed(cmldine args), which can be used to appraise/attest at a later stage.
The kexec cmdline buffer is stored as HEX in the buf field of the event_data.
-Call the ima_kexec_cmdline(...) hook from kexec_file_load call.
The ima logs need to be carried over to the next kernel, which will be followed up by other patchsets for x86_64 and arm64.
The kexec cmdline hash is stored in the "d-ng" field of the template data. and can be verified using
sudo cat /sys/kernel/security/integrity/ima/ascii_runtime_measurements |
grep kexec-cmdline | cut -d' ' -f 6 | xxd -r -p | sha256sum
Changelog:
V10(since V9):
-rebased over next-queued-integrity
-code cleanup
V9(since V8):
- code cleanup
V8(since V7):
- added a new ima template name "ima-buf"
- code cleanup
V7:
- rebased to next-queued-testing
https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git/log/?h=next-queued-testing
V6:
-add a new ima hook and policy to measure the cmdline
args(ima_kexec_cmdline)
-add a new template field buf to contain the buffer measured. [suggested by Mimi Zohar]
add new fields to ima_event_data to store/read buffer data.
[suggested by Roberto]
-call ima_kexec_cmdline from kexec_file_load path
v5:
-add a new ima hook and policy to measure the cmdline
args(ima_kexec_cmdline)
-add a new template field buf to contain the buffer measured.
[suggested by Mimi Zohar]
-call ima_kexec_cmdline from kexec_file_load path
v4:
- per feedback from LSM community, removed the LSM hook and renamed the IMA policy to KEXEC_CMDLINE
v3: (rebase changes to next-general)
- Add policy checks for buffer[suggested by Mimi Zohar]
- use the IMA_XATTR to add buffer
- Add kexec_cmdline used for kexec file load
- Add an LSM hook to allow usage by other LSM.[suggestd by Mimi Zohar]
v2:
- Add policy checks for buffer[suggested by Mimi Zohar]
- Add an LSM hook to allow usage by other LSM.[suggestd by Mimi Zohar]
- use the IMA_XATTR to add buffer instead of sig template
v1:
-Add kconfigs to control the ima_buffer_check -measure the cmdline args suffixed with the kernel file name -add the buffer to the template sig field.
Prakhar Srivastava (3):
Add a new ima hook ima_kexec_cmdline to measure cmdline args add a new ima template field buf
call ima_kexec_cmdline to measure the cmdline args
Documentation/ABI/testing/ima_policy | 1 + Documentation/security/IMA-templates.rst | 2 +- include/linux/ima.h | 2 + kernel/kexec_file.c | 8 ++- security/integrity/ima/ima.h | 3 + security/integrity/ima/ima_api.c | 5 +- security/integrity/ima/ima_init.c | 2 +- security/integrity/ima/ima_main.c | 80 +++++++++++++++++++++++ security/integrity/ima/ima_policy.c | 9 +++ security/integrity/ima/ima_template.c | 2 + security/integrity/ima/ima_template_lib.c | 20 ++++++ security/integrity/ima/ima_template_lib.h | 4 ++ 12 files changed, 131 insertions(+), 7 deletions(-)
Signature · 1 line
2.17.1
PATCH v10 1/3 IMA: Define a new hook to measure the kexec boot command line arguments
Currently during soft reboot(kexec_file_load) boot command line arguments are not measured. Define hooks needed to measure kexec command line arguments during soft reboot(kexec_file_load).
- A new ima hook ima_kexec_cmdline is defined to be called by the kexec code.
- A new function process_buffer_measurement is defined to measure the buffer hash into the IMA measurement list.
- A new func policy KEXEC_CMDLINE is defined to control the measurement.[Suggested by Mimi]
--- Documentation/ABI/testing/ima_policy | 1 + include/linux/ima.h | 2 + security/integrity/ima/ima.h | 1 + security/integrity/ima/ima_api.c | 1 + security/integrity/ima/ima_main.c | 72 ++++++++++++++++++++++++++++ security/integrity/ima/ima_policy.c | 7 +++ 6 files changed, 84 insertions(+)
Documentation/ABI/testing/ima_policy +1 -0
@@ -28,6 +28,7 @@ Description: base: func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK][MODULE_CHECK] [FIRMWARE_CHECK] [KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK] + [KEXEC_CMDLINE] mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND] [[^]MAY_EXEC] fsmagic:= hex value
include/linux/ima.h +2 -0
@@ -26,6 +26,7 @@ extern int ima_read_file(struct file *file, enum kernel_read_file_id id);extern int ima_post_read_file (struct file *file,void *buf,loff_t size,enum kernel_read_file_id id);extern void ima_post_path_mknod (struct dentry *dentry); +extern void ima_kexec_cmdline (const void *buf,int size);#ifdef CONFIG_IMA_KEXEC extern void ima_add_kexec_buffer (struct kimage *image);
@@ -92,6 +93,7 @@ static inline void ima_post_path_mknod(struct dentry *dentry) return; } +static inline void ima_kexec_cmdline (const void *buf,int size) {}#endif /* CONFIG_IMA */ #ifndef CONFIG_IMA_KEXEC
security/integrity/ima/ima.h +1 -0
@@ -190,6 +190,7 @@ static inline unsigned long ima_hash_key(u8 *digest) hook(KEXEC_KERNEL_CHECK) \ hook(KEXEC_INITRAMFS_CHECK) \ hook(POLICY_CHECK) \ + hook(KEXEC_CMDLINE) \ hook(MAX_CHECK) #define __ima_hook_enumify(ENUM) ENUM,
security/integrity/ima/ima_api.c +1 -0
@@ -178,6 +178,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,* subj=, obj=, type=, func=, mask=, fsmagic= * subj,obj, and type: are LSM specific. * func: FILE_CHECK | BPRM_CHECK | CREDS_CHECK | MMAP_CHECK | MODULE_CHECK +* | KEXEC_CMDLINE * mask: contains the permission mask * fsmagic: hex value *
security/integrity/ima/ima_main.c +72 -0
78 lines not on this page · raw message
security/integrity/ima/ima_policy.c +7 -0
@@ -374,6 +374,11 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, {int i; +if (func ==KEXEC_CMDLINE ) { +if ((rule->flags &IMA_FUNC ) && (rule->func == func)) +return true; +return false; + }if ((rule->flags &IMA_FUNC ) && (rule->func != func && func !=POST_SETATTR ))return false;
@@ -956,6 +961,8 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) entry->func =KEXEC_INITRAMFS_CHECK ; else if (strcmp(args[0].from, "POLICY_CHECK") == 0) entry->func = POLICY_CHECK; + else if (strcmp(args[0].from, "KEXEC_CMDLINE") == 0) + entry->func = KEXEC_CMDLINE; else result = -EINVAL ;if (!result)
Signature · 1 line
2.19.1
Mimi Zohar
maintainerRe: [PATCH V10 1/3] IMA: Define a new hook to measure the kexec boot command line arguments
Hi Prakhar,
Quoted 4 lines · Prakhar Srivastava
Currently during soft
reboot(kexec_file_load)boot command line arguments are not measured. Define hooks needed to measure kexec command line arguments during softreboot(kexec_file_load).
Quoted 8 lines
- A new ima hook
ima_kexec_cmdlineis defined to be called by the kexec code.
- A new functionprocess_buffer_measurementis defined to measure the buffer hash into the IMA measurement list.
- A new func policyKEXEC_CMDLINEis defined to control the measurement.[Suggested by Mimi]Signed-off-by Prakhar Srivastava <[email protected]>
Thanks! This patch set is now queued in the next-queued-testing branch for any last minute comments or Reviews/Acks, before being staged in the next-integrity branch.
Mimi
PATCH v10 2/3 IMA: Define a new template field buf
In reply to Prakhar SrivastavaA buffer(kexec boot command line arguments) measured into IMA measuremnt list cannot be appraised, without already being aware of the buffer contents. Since hashes are non-reversible, raw buffer is needed for validation or regenerating hash for appraisal/attestation.
Add support to store/read the buffer contents in HEX.
The kexec cmdline hash is stored in the "d-ng" field of the template data,it can be verified using
sudo cat /sys/kernel/security/integrity/ima/ascii_runtime_measurements |
grep kexec-cmdline | cut -d' ' -f 6 | xxd -r -p | sha256sum
- Add two new fields to ima_event_data to hold the buf and buf_len [Suggested by Roberto]
- Add a new temaplte field 'buf' to be used to store/read the buffer data.[Suggested by Mimi]
- Updated process_buffer_meaurement to add the buffer to ima_event_data. process_buffer_measurement added in "Define a new IMA hook to measure the boot command line arguments"
- Add a new template policy name ima-buf to represent 'd-ng|n-ng|buf'
--- Documentation/security/IMA-templates.rst | 7 ++++--- security/integrity/ima/ima.h | 2 ++ security/integrity/ima/ima_main.c | 4 +++- security/integrity/ima/ima_template.c | 3 +++ security/integrity/ima/ima_template_lib.c | 21 +++++++++++++++++++++ security/integrity/ima/ima_template_lib.h | 4 ++++ 6 files changed, 37 insertions(+), 4 deletions(-)
Documentation/security/IMA-templates.rst +4 -3
@@ -69,15 +69,16 @@ descriptors by adding their identifier to the format string algorithm (field format: [<hash algo>:]digest, where the digest prefix is shown only if the hash algorithm is not SHA1 or MD5); - 'n-ng': the name of the event, without size limitations; - - 'sig': the file signature. + - 'sig': the file signature; + - 'buf': the buffer data that was used to generate the hash without size limitations; Below, there is the list of defined template descriptors: - "ima": its format is ``d|n``; - "ima-ng" (default): its format is ``d-ng|n-ng``; - - "ima-sig": its format is ``d-ng|n-ng|sig``. - + - "ima-sig": its format is ``d-ng|n-ng|sig``; + - "ima-buf": its format is ``d-ng|n-ng|buf``; Use
security/integrity/ima/ima.h +2 -0
@@ -65,6 +65,8 @@ struct ima_event_data {struct evm_ima_xattr_data *xattr_value;int xattr_len;const char *violation; +const void *buf; +int buf_len; };/* IMA template field data definition */
security/integrity/ima/ima_main.c +3 -1
@@ -627,7 +627,9 @@ static void process_buffer_measurement(const void *buf, int size,struct ima_template_entry *entry =NULL ;struct integrity_iint_cache iint = {};struct ima_event_data event_data = {.iint = &iint, - .filename = eventname}; + .filename = eventname, + .buf = buf, + .buf_len = size};struct ima_template_desc *template_desc =NULL ;struct {struct ima_digest_data hdr;
security/integrity/ima/ima_template.c +3 -0
@@ -26,6 +26,7 @@ static struct ima_template_desc builtin_templates[] = { {.name = IMA_TEMPLATE_IMA_NAME, .fmt = IMA_TEMPLATE_IMA_FMT}, {.name = "ima-ng", .fmt = "d-ng|n-ng"}, {.name = "ima-sig", .fmt = "d-ng|n-ng|sig"}, + {.name = "ima-buf", .fmt = "d-ng|n-ng|buf"}, {.name = "", .fmt = ""}, /* placeholder for a custom format */ };
@@ -43,6 +44,8 @@ static const struct ima_template_field supported_fields[] = { .field_show = ima_show_template_string}, {.field_id = "sig", .field_init = ima_eventsig_init, .field_show = ima_show_template_sig}, + {.field_id = "buf", .field_init = ima_eventbuf_init, + .field_show = ima_show_template_buf}, };#define MAX_TEMPLATE_NAME_LEN 15
security/integrity/ima/ima_template_lib.c +21 -0
@@ -162,6 +162,12 @@ void ima_show_template_sig(struct seq_file *m, enum ima_show_type show,ima_show_template_field_data (m, show,DATA_FMT_HEX , field_data); } +void ima_show_template_buf (struct seq_file *m,enum ima_show_type show, +struct ima_field_data *field_data) +{ +ima_show_template_field_data (m, show,DATA_FMT_HEX , field_data); +} +/** * ima_parse_buf() - Parses lengths and data from an input buffer * @bufstartp: Buffer start address.
@@ -389,3 +395,18 @@ int ima_eventsig_init(struct ima_event_data *event_data,return ima_write_template_field_data (xattr_value, event_data->xattr_len,DATA_FMT_HEX , field_data); } + +/* +* ima_eventbuf_init - include the buffer(kexec-cmldine) as part of the +* template data. +*/ +int ima_eventbuf_init (struct ima_event_data *event_data, +struct ima_field_data *field_data) +{ +if ((!event_data->buf) || (event_data->buf_len ==0 )) +return 0 ; + +return ima_write_template_field_data (event_data->buf, + event_data->buf_len,DATA_FMT_HEX , + field_data); +}
security/integrity/ima/ima_template_lib.h +4 -0
@@ -29,6 +29,8 @@ void ima_show_template_string(struct seq_file *m, enum ima_show_type show, struct ima_field_data *field_data);void ima_show_template_sig (struct seq_file *m,enum ima_show_type show,struct ima_field_data *field_data); +void ima_show_template_buf (struct seq_file *m,enum ima_show_type show, +struct ima_field_data *field_data);int ima_parse_buf (void *bufstartp,void *bufendp,void **bufcurp,int maxfields,struct ima_field_data *fields,int *curfields,unsigned long *len_mask,int enforce_mask,char *bufname);
@@ -42,4 +44,6 @@ int ima_eventname_ng_init(struct ima_event_data *event_data, struct ima_field_data *field_data);int ima_eventsig_init (struct ima_event_data *event_data,struct ima_field_data *field_data); +int ima_eventbuf_init (struct ima_event_data *event_data, +struct ima_field_data *field_data);#endif /* __LINUX_IMA_TEMPLATE_LIB_H */
Signature · 1 line
2.19.1
Re: [PATCH V10 2/3] IMA: Define a new template field buf
Hello Prakhar,
Quoted 13 lines · Prakhar Srivastava
security/integrity/ima/ima_template.c +1
-0@@ -26,6 +26,7 @@ static struct ima_template_desc builtin_templates[] = { {.name = IMA_TEMPLATE_IMA_NAME, .fmt = IMA_TEMPLATE_IMA_FMT}, {.name = "ima-ng", .fmt = "d-ng|n-ng"}, {.name = "ima-sig", .fmt = "d-ng|n-ng|sig"}, + {.name = "ima-buf", .fmt = "d-ng|n-ng|buf"}, {.name = "", .fmt = ""}, /* placeholder for a custom format */ };
security/integrity/ima/ima_template.c static const struct ima_template_field supported_fields[] = { · line 50
Quoted 7 lines
security/integrity/ima/ima_template.c +2
-0@@ -43,6 +44,8 @@ static const struct ima_template_field supported_fields[] = { .field_show = ima_show_template_string}, {.field_id = "sig", .field_init = ima_eventsig_init, .field_show = ima_show_template_sig}, + {.field_id = "buf", .field_init = ima_eventbuf_init, + .field_show = ima_show_template_buf}, };#define MAX_TEMPLATE_NAME_LEN 15
Currently, MAX_TEMPLATE_NAME_LEN is the length of a template that contains all valid fields. It may make sense to increase it since there's a new field being added.
I suggest using a sizeof() to show where the number comes from (and which can be visually shown to be correct):
#define MAX_TEMPLATE_NAME_LEN sizeof("d|n|d-ng|n-ng|sig|buf")
The sizeof() is calculated at compile time.
--
Thiago Jung Bauermann
IBM Linux Technology Center
Mimi Zohar
maintainerRe: [PATCH V10 2/3] IMA: Define a new template field buf
Quoted 29 lines · Thiago Jung Bauermann
Hello Prakhar,
Quoted 13 lines · Prakhar Srivastava
security/integrity/ima/ima_template.c +1
-0@@ -26,6 +26,7 @@ static struct ima_template_desc builtin_templates[] = { {.name = IMA_TEMPLATE_IMA_NAME, .fmt = IMA_TEMPLATE_IMA_FMT}, {.name = "ima-ng", .fmt = "d-ng|n-ng"}, {.name = "ima-sig", .fmt = "d-ng|n-ng|sig"}, + {.name = "ima-buf", .fmt = "d-ng|n-ng|buf"}, {.name = "", .fmt = ""}, /* placeholder for a custom format */ };security/integrity/ima/ima_template.c static const struct ima_template_field supported_fields[] = { · line 50
Quoted 7 lines
security/integrity/ima/ima_template.c +2
-0@@ -43,6 +44,8 @@ static const struct ima_template_field supported_fields[] = { .field_show = ima_show_template_string}, {.field_id = "sig", .field_init = ima_eventsig_init, .field_show = ima_show_template_sig}, + {.field_id = "buf", .field_init = ima_eventbuf_init, + .field_show = ima_show_template_buf}, };#define MAX_TEMPLATE_NAME_LEN 15Currently,
MAX_TEMPLATE_NAME_LENis the length of a template that contains all valid fields. It may make sense to increase it since there's a new field being added.
Quoted 6 lines
I suggest using a
sizeof()to show where the number comes from (and which can be visually shown to be correct):#define
MAX_TEMPLATE_NAME_LENsizeof("d|n|d-ng|n-ng|sig|buf")The
sizeof()is calculated at compile time.
MAX_TEMPLATE_NAME_LEN is used when restoring measurements carried over from a kexec. 'd' and 'd-ng' should not both be defined in the template description, nor should 'n' and 'n-ng'. Even without the duplication, the MAX_TEPLATE_NAME_LEN is greater than the current 15.
Thiago, could you address this as a separate patch?
thanks!
Mimi
Re: [PATCH V10 2/3] IMA: Define a new template field buf
Quoted 33 lines · Mimi Zohar
Quoted 32 lines · Thiago Jung Bauermann
Hello Prakhar,
Quoted 13 lines · Prakhar Srivastava
security/integrity/ima/ima_template.c +1
-0@@ -26,6 +26,7 @@ static struct ima_template_desc builtin_templates[] = { {.name = IMA_TEMPLATE_IMA_NAME, .fmt = IMA_TEMPLATE_IMA_FMT}, {.name = "ima-ng", .fmt = "d-ng|n-ng"}, {.name = "ima-sig", .fmt = "d-ng|n-ng|sig"}, + {.name = "ima-buf", .fmt = "d-ng|n-ng|buf"}, {.name = "", .fmt = ""}, /* placeholder for a custom format */ };security/integrity/ima/ima_template.c static const struct ima_template_field supported_fields[] = { · line 50
Quoted 7 lines
security/integrity/ima/ima_template.c +2
-0@@ -43,6 +44,8 @@ static const struct ima_template_field supported_fields[] = { .field_show = ima_show_template_string}, {.field_id = "sig", .field_init = ima_eventsig_init, .field_show = ima_show_template_sig}, + {.field_id = "buf", .field_init = ima_eventbuf_init, + .field_show = ima_show_template_buf}, };#define MAX_TEMPLATE_NAME_LEN 15Currently,
MAX_TEMPLATE_NAME_LENis the length of a template that contains all valid fields. It may make sense to increase it since there's a new field being added.I suggest using a
sizeof()to show where the number comes from (and which can be visually shown to be correct):
Quoted 7 lines
Quoted 3 lines
#define
MAX_TEMPLATE_NAME_LENsizeof("d|n|d-ng|n-ng|sig|buf")The
sizeof()is calculated at compile time.
MAX_TEMPLATE_NAME_LENis used when restoring measurements carried over from a kexec. 'd' and 'd-ng' should not both be defined in the template description, nor should 'n' and 'n-ng'.
Ah, makes sense. Thanks for that information.
Quoted 4 lines
Even without the
duplication, theMAX_TEPLATE_NAME_LENis greater than the current 15.Thiago, could you address this as a separate patch?
Yes, I just sent a patch.
Signature · 2 lines
Thiago Jung Bauermann IBM Linux Technology Center
PATCH v10 3/3 KEXEC: Call ima_kexec_cmdline to measure the boot command line args
In reply to Prakhar SrivastavaDuring soft reboot(kexec_file_load) boot command line arguments are not measured.
Call ima hook ima_kexec_cmdline to measure the boot command line arguments into IMA measurement list.
- call ima_kexec_cmdline from kexec_file_load.
- move the call ima_add_kexec_buffer after the cmdline args have been measured.
--- kernel/kexec_file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/kexec_file.c +6 -3
@@ -198,9 +198,6 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,return ret; image->kernel_buf_len = size; -/* IMA needs to pass the measurement list to the next kernel. */ -ima_add_kexec_buffer (image); -/* Call arch image probe handlers */ ret =arch_kexec_kernel_image_probe (image, image->kernel_buf, image->kernel_buf_len);
@@ -241,8 +238,14 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd, ret = -EINVAL ; goto out; } + +ima_kexec_cmdline (image->cmdline_buf, + image->cmdline_buf_len -1 ); } +/* IMA needs to pass the measurement list to the next kernel. */ +ima_add_kexec_buffer (image); +/* Call arch image load handlers */ ldata =arch_kexec_kernel_image_load (image);
Signature · 1 line
2.19.1