sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/smmstore: Fix some issues

Browse Source 
This fixes the following:
- Fix smmstore_read_region to actually read stuff
- Make the API ARCH independent (no dependency on size_t)
- clean up the code a little
- Change the loglevel for non error messages to BIOS_DEBUG

Change-Id: I629be25d2a9b65796ae8f7a700b6bdab57b91b22
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Arthur Heymans
2018-12-26 11:20:59 +01:00
committed by Jeremy Soller
parent 4d6cfc82ed
commit ef4042cf61
3 changed files with 84 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/drivers/smmstore/store.c
View File

@@ -61,8 +61,8 @@ static int lookup_store(struct region_device *rstore)
if (cbfs_locate_file_in_region(&file,
CONFIG_SMMSTORE_REGION,
CONFIG_SMMSTORE_FILENAME, NULL) < 0) {
printk(BIOS_WARNING, "smm store: "
"Unable to find SMM store file in region '%s'\n",
printk(BIOS_WARNING,
"smm store: Unable to find SMM store file in region '%s'\n",
CONFIG_SMMSTORE_REGION);
return -1;
}
@@ -86,14 +86,13 @@ static int lookup_store(struct region_device *rstore)
* returns 0 on success, -1 on failure
* writes up to `*bufsize` bytes into `buf` and updates `*bufsize`
*/
int smmstore_read_region(void *buf, ssize_t *bufsize)
int smmstore_read_region(void *buf, uint32_t *bufsize)
{
struct region_device store;
if (bufsize == NULL)
return -1;
*bufsize = 0;
if (lookup_store(&store) < 0) {
printk(BIOS_WARNING, "reading region failed\n");
return -1;
@@ -108,6 +107,66 @@ int smmstore_read_region(void *buf, ssize_t *bufsize)
return 0;
}
static enum cb_err scan_end(ssize_t *end)
{
struct region_device store;
if (lookup_store(&store) < 0) {
printk(BIOS_WARNING, "reading region failed\n");
return CB_ERR;
}
ssize_t data_sz = region_device_sz(&store);
/* scan for end */
*end = 0;
uint32_t k_sz, v_sz;
while (*end < data_sz) {
/* make odd corner cases identifiable, eg. invalid v_sz */
k_sz = 0;
if (rdev_readat(&store, &k_sz, *end, sizeof(k_sz)) < 0) {
printk(BIOS_WARNING, "failed reading key size\n");
return CB_ERR;
}
/* found the end */
if (k_sz == 0xffffffff)
break;
/* something is fishy here:
* Avoid wrapping (since data_size < MAX_UINT32_T / 2) while
* other problems are covered by the loop condition
*/
if (k_sz > data_sz) {
printk(BIOS_WARNING, "key size out of bounds\n");
return CB_ERR;
}
if (rdev_readat(&store, &v_sz, *end + 4, sizeof(v_sz)) < 0) {
printk(BIOS_WARNING, "failed reading value size\n");
return CB_ERR;
}
if (v_sz > data_sz) {
printk(BIOS_WARNING, "value size out of bounds\n");
return CB_ERR;
}
*end += sizeof(k_sz) + sizeof(v_sz) + k_sz + v_sz + 1;
*end = ALIGN_UP(*end, sizeof(uint32_t));
}
printk(BIOS_DEBUG, "used smm store size might be 0x%zx bytes\n", *end);
if (k_sz != 0xffffffff) {
printk(BIOS_WARNING,
"eof of data marker looks invalid: 0x%x\n", k_sz);
return CB_ERR;
}
return CB_SUCCESS;
}
/*
* Append data to region
*
@@ -123,78 +182,37 @@ int smmstore_append_data(void *key, uint32_t key_sz,
return -1;
}
ssize_t data_sz = region_device_sz(&store);
/* scan for end */
ssize_t end = 0;
uint32_t k_sz, v_sz;
while (end < data_sz) {
/* make odd corner cases identifiable, eg. invalid v_sz */
k_sz = 0;
if (rdev_readat(&store, &k_sz, end, sizeof(k_sz)) < 0) {
printk(BIOS_WARNING, "failed reading key size\n");
return -1;
}
/* found the end */
if (k_sz == 0xffffffff)
break;
/* something is fishy here:
* Avoid wrapping (since data_size < MAX_UINT32_T / 2) while
* other problems are covered by the loop condition
*/
if (k_sz > data_sz) {
printk(BIOS_WARNING, "key size out of bounds\n");
return -1;
}
if (rdev_readat(&store, &v_sz, end + 4, sizeof(v_sz)) < 0) {
printk(BIOS_WARNING, "failed reading value size\n");
return -1;
}
if (v_sz > data_sz) {
printk(BIOS_WARNING, "value size out of bounds\n");
return -1;
}
end += 8 + k_sz + v_sz + 1;
end = ALIGN_UP(end, sizeof(uint32_t));
}
printk(BIOS_WARNING, "used smm store size might be 0x%zx bytes\n", end);
if (k_sz != 0xffffffff) {
printk(BIOS_WARNING,
"eof of data marker looks invalid: 0x%x\n", k_sz);
ssize_t end;
if (scan_end(&end) == CB_ERR)
return -1;
}
printk(BIOS_WARNING, "used size looks legit\n");
printk(BIOS_DEBUG, "used size looks legit\n");
printk(BIOS_WARNING, "open (%zx, %zx) for writing\n",
printk(BIOS_DEBUG, "open (%zx, %zx) for writing\n",
region_device_offset(&store), region_device_sz(&store));
if (boot_device_rw_subregion(&store.region, &store) < 0) {
if (boot_device_rw_subregion(region_device_region(&store), &store) < 0) {
printk(BIOS_WARNING, "couldn't open store for writing\n");
return -1;
}
uint32_t record_sz = 8 + key_sz + value_sz + 1;
if (end + record_sz >= data_sz) {
struct region subregion = {
.offset = end,
.size = sizeof(key_sz) + sizeof(value_sz) + key_sz + value_sz + 1,
};
if (region_is_subregion(region_device_region(&store), &subregion)) {
printk(BIOS_WARNING, "not enough space for new data\n");
return -1;
}
if (rdev_writeat(&store, &key_sz, end, 4) != 4) {
if (rdev_writeat(&store, &key_sz, end, sizeof(key_sz)) != sizeof(key_sz)) {
printk(BIOS_WARNING, "failed writing key size\n");
}
end += 4;
if (rdev_writeat(&store, &value_sz, end, 4) != 4) {
end += sizeof(key_sz);
if (rdev_writeat(&store, &value_sz, end, sizeof(value_sz)) != sizeof(key_sz)) {
printk(BIOS_WARNING, "failed writing value size\n");
}
end += 4;
end += sizeof(value_sz);
if (rdev_writeat(&store, key, end, key_sz) != key_sz) {
printk(BIOS_WARNING, "failed writing key data\n");
}
@@ -204,7 +222,7 @@ int smmstore_append_data(void *key, uint32_t key_sz,
}
end += value_sz;
uint8_t nul = 0;
if (rdev_writeat(&store, &nul, end, 1) != 1) {
if (rdev_writeat(&store, &nul, end, sizeof(nul)) != sizeof(nul)) {
printk(BIOS_WARNING, "failed writing termination\n");
}

8
src/include/smmstore.h
View File

@@ -29,21 +29,21 @@
struct smmstore_params_read {
void *buf;
ssize_t bufsize;
uint32_t bufsize;
};
struct smmstore_params_append {
void *key;
size_t keysize;
uint32_t keysize;
void *val;
size_t valsize;
uint32_t valsize;
};
/* SMM responder */
uint32_t smmstore_exec(uint8_t command, void *param);
/* implementation */
int smmstore_read_region(void *buf, ssize_t *bufsize);
int smmstore_read_region(void *buf, uint32_t *bufsize);
int smmstore_append_data(void *key, uint32_t key_sz,
void *value, uint32_t value_sz);
int smmstore_clear_region(void);

2
src/soc/intel/common/block/smm/smihandler.c
View File

@@ -310,7 +310,7 @@ static void southbridge_smi_store(
reg_ebx = save_state_ops->get_reg(io_smi, RBX);
/* drivers/smmstore/smi.c */
ret = smmstore_exec(sub_command, (void *)reg_ebx);
ret = smmstore_exec(sub_command, (uintptr_t *)reg_ebx);
save_state_ops->set_reg(io_smi, RAX, ret);
}