kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl/boot: Limit the hash table size when parsing environment block

Browse Source 
When parsing environment block, limit the number of the hash table
entries, so that total size of all records doesn't exceed PAGE_SIZE
bytes allocated for that hash table.

Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Eduard Shishkin <edward6@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Eduard Shishkin
2026-07-15 11:31:14 +02:00
committed by Jan Höppner
parent 9ce9ed72a9
commit dd380942ed
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zipl/boot/stage3.c
View File

@@ -171,12 +171,12 @@ static struct env_hash_entry *hash_table_find(struct env_hash_entry **buckets,
* magic'\n'name1=value1'\n'...nameN=valueN'\n'zero-padding
*/
static void parse_envblk(struct env_hash_entry *items,
struct env_hash_entry **buckets,
unsigned int *nr)
struct env_hash_entry **buckets)
{
char sgn[] = ZIPL_ENVBLK_SIGNATURE;
unsigned int len = 0;
unsigned int off = 0;
unsigned int idx = 0;
char *name;
char *value;
@@ -198,11 +198,11 @@ static void parse_envblk(struct env_hash_entry *items,
break;
len++;
}
while (off < len) {
while (off < len && idx < PAGE_SIZE / sizeof(struct env_hash_entry)) {
value = strchr(name, 0x3D /* = */) + 1;
/* null-terminate the name */
*(value - 1) = 0;
hash_table_add(items, buckets, nr, (unsigned long)name);
hash_table_add(items, buckets, &idx, (unsigned long)name);
off += (value - name); /* offset of the value */
name = strchr(value, 0x0A /* /n */) + 1;
@@ -398,7 +398,6 @@ static void handle_environment(unsigned int len, unsigned int max_len)
{
struct env_hash_entry *buckets[STR_HASH_SIZE];
struct env_hash_entry *items;
unsigned int nr_items = 0;
struct nr_pair np;
if (_stage3_parms.envblk_addr == 0 ||
@@ -410,7 +409,7 @@ static void handle_environment(unsigned int len, unsigned int max_len)
/*
* scan in-memory environment block and populate hash table
*/
parse_envblk(items, buckets, &nr_items);
parse_envblk(items, buckets);
/*
* find environment variables in the command line and
* replace them with their values as found in the hash table