Skip to content

Commit dbc335d

Browse files
Roberto SassuMimi Zohar
Roberto Sassu
authored and
Mimi Zohar
committed
ima: make a copy of template_fmt in template_desc_init_fields()
This patch makes a copy of the 'template_fmt' function argument so that the latter will not be modified by strsep(), which does the splitting by replacing the given separator with '\0'.  IMA: No TPM chip found, activating TPM-bypass!  Unable to handle kernel pointer dereference at virtual kernel address 0000000000842000  Oops: 0004 [#1] SMP  Modules linked in:  CPU: 3 PID: 1 Comm: swapper/0 Not tainted 3.12.0-rc2-00098-g3ce1217d6cd5 #17  task: 000000003ffa0000 ti: 000000003ff84000 task.ti: 000000003ff84000  Krnl PSW : 0704e00180000000 000000000044bf88 (strsep+0x7c/0xa0)             R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 EA:3  Krnl GPRS: 000000000000007c 000000000000007c 000000003ff87d90 0000000000821fd8             0000000000000000 000000000000007c 0000000000aa37e0 0000000000aa9008             0000000000000051 0000000000a114d8 0000000100000002 0000000000842bde             0000000000842bdf 00000000006f97f0 000000000040062c 000000003ff87cf0  Krnl Code: 000000000044bf7c: a7f4000a           brc     15,44bf90             000000000044bf80: b90200cc           ltgr    %r12,%r12            #000000000044bf84: a7840006           brc     8,44bf90            >000000000044bf88: 9200c000           mvi     0(%r12),0             000000000044bf8c: 41c0c001           la      %r12,1(%r12)             000000000044bf90: e3c020000024       stg     %r12,0(%r2)             000000000044bf96: b904002b           lgr     %r2,%r11             000000000044bf9a: ebbcf0700004       lmg     %r11,%r12,112(%r15)  Call Trace:  ([<00000000004005fe>] ima_init_template+0xa2/0x1bc)   [<0000000000a7c896>] ima_init+0x7a/0xa8   [<0000000000a7c938>] init_ima+0x24/0x40   [<00000000001000e8>] do_one_initcall+0x68/0x128   [<0000000000a4eb56>] kernel_init_freeable+0x20a/0x2b4   [<00000000006a1ff4>] kernel_init+0x30/0x178   [<00000000006b69fe>] kernel_thread_starter+0x6/0xc   [<00000000006b69f8>] kernel_thread_starter+0x0/0xc  Last Breaking-Event-Address:   [<000000000044bf42>] strsep+0x36/0xa0 Fixes commit: adf53a7 ima: new templates management mechanism Changelog v1: - make template_fmt 'const char *' (reported-by James Morris) - fix kstrdup memory leak (reported-by James Morris) Reported-by: Heiko Carstens <[email protected]> Signed-off-by: Roberto Sassu <[email protected]> Signed-off-by: Mimi Zohar <[email protected]> Tested-by: Heiko Carstens <[email protected]>
1 parent 3e8e550 commit dbc335d

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

security/integrity/ima/ima_template.c

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static struct ima_template_field *lookup_template_field(const char *field_id)
9090
return NULL;
9191
}
9292

93-
static int template_fmt_size(char *template_fmt)
93+
static int template_fmt_size(const char *template_fmt)
9494
{
9595
char c;
9696
int template_fmt_len = strlen(template_fmt);
@@ -106,23 +106,28 @@ static int template_fmt_size(char *template_fmt)
106106
return j + 1;
107107
}
108108

109-
static int template_desc_init_fields(char *template_fmt,
109+
static int template_desc_init_fields(const char *template_fmt,
110110
struct ima_template_field ***fields,
111111
int *num_fields)
112112
{
113-
char *c, *template_fmt_ptr = template_fmt;
113+
char *c, *template_fmt_copy;
114114
int template_num_fields = template_fmt_size(template_fmt);
115115
int i, result = 0;
116116

117117
if (template_num_fields > IMA_TEMPLATE_NUM_FIELDS_MAX)
118118
return -EINVAL;
119119

120+
/* copying is needed as strsep() modifies the original buffer */
121+
template_fmt_copy = kstrdup(template_fmt, GFP_KERNEL);
122+
if (template_fmt_copy == NULL)
123+
return -ENOMEM;
124+
120125
*fields = kzalloc(template_num_fields * sizeof(*fields), GFP_KERNEL);
121126
if (*fields == NULL) {
122127
result = -ENOMEM;
123128
goto out;
124129
}
125-
for (i = 0; (c = strsep(&template_fmt_ptr, "|")) != NULL &&
130+
for (i = 0; (c = strsep(&template_fmt_copy, "|")) != NULL &&
126131
i < template_num_fields; i++) {
127132
struct ima_template_field *f = lookup_template_field(c);
128133

@@ -133,10 +138,12 @@ static int template_desc_init_fields(char *template_fmt,
133138
(*fields)[i] = f;
134139
}
135140
*num_fields = i;
136-
return 0;
137141
out:
138-
kfree(*fields);
139-
*fields = NULL;
142+
if (result < 0) {
143+
kfree(*fields);
144+
*fields = NULL;
145+
}
146+
kfree(template_fmt_copy);
140147
return result;
141148
}
142149

0 commit comments

Comments
 (0)