Skip to contentSkip to conversation

hv: kvp: Avoid reading past allocated blocks from KVP file

PATCH Superseded Long Li 3 participants 5 messages Oct 31, 2017 – Nov 1, 2017

Subsystems (2)
lore
Share & tools
lore

Long Li

author
#0 lore raw

PATCH v2 1/1 hv: kvp: Avoid reading past allocated blocks from KVP file

From: Paul Meyer <[email protected]>

While reading in more than one block (50) of KVP records, the allocation goes per block, but the reads used the total number of allocated records (without resetting the pointer/stream). This causes the records buffer to overrun when the refresh reads more than one block over the previous capacity (e.g. reading more than 100 KVP records whereas the in-memory database was empty before).

Fix this by reading the correct number of KVP records from file each time.

---
 tools/hv/hv_kvp_daemon.c | 66 ++++++++----------------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)
tools/hv/hv_kvp_daemon.c +10 -56
index eaa3bec..2094036 100644
@@ -193,11 +193,13 @@ static void kvp_update_mem_state(int pool)
 	for (;;) {
 		readp = &record[records_read];
 		records_read += fread(readp, sizeof(struct kvp_record),
-					ENTRIES_PER_BLOCK * num_blocks,
-					filep);
+				ENTRIES_PER_BLOCK * num_blocks - records_read,
+				filep);
 
 		if (ferror(filep)) {
-			syslog(LOG_ERR, "Failed to read file, pool: %d", pool);
+			syslog(LOG_ERR,
+				"Failed to read file, pool: %d; error: %d %s",
+				 pool, errno, strerror(errno));
 			exit(EXIT_FAILURE);
 		}
 
@@ -224,15 +226,11 @@ static void kvp_update_mem_state(int pool)
 	fclose(filep);
 	kvp_release_lock(pool);
 }
+
 static int kvp_file_init(void)
 {
 	int  fd;
-	FILE *filep;
-	size_t records_read;
 	char *fname;
-	struct kvp_record *record;
-	struct kvp_record *readp;
-	int num_blocks;
 	int i;
 	int alloc_unit = sizeof(struct kvp_record) * ENTRIES_PER_BLOCK;
 
@@ -246,61 +244,17 @@ static int kvp_file_init(void)
 
 	for (i = 0; i < KVP_POOL_COUNT; i++) {
 		fname = kvp_file_info[i].fname;
-		records_read = 0;
-		num_blocks = 1;
 		sprintf(fname, "%s/.kvp_pool_%d", KVP_CONFIG_LOC, i);
 		fd = open(fname, O_RDWR | O_CREAT | O_CLOEXEC, 0644 /* rw-r--r-- */);
 
 		if (fd == -1)
 			return 1;
 
-
-		filep = fopen(fname, "re");
-		if (!filep) {
-			close(fd);
-			return 1;
-		}
-
-		record = malloc(alloc_unit * num_blocks);
-		if (record == NULL) {
-			fclose(filep);
-			close(fd);
-			return 1;
-		}
-		for (;;) {
-			readp = &record[records_read];
-			records_read += fread(readp, sizeof(struct kvp_record),
-					ENTRIES_PER_BLOCK,
-					filep);
-
-			if (ferror(filep)) {
-				syslog(LOG_ERR, "Failed to read file, pool: %d",
-				       i);
-				exit(EXIT_FAILURE);
-			}
-
-			if (!feof(filep)) {
-				/*
-				 * We have more data to read.
-				 */
-				num_blocks++;
-				record = realloc(record, alloc_unit *
-						num_blocks);
-				if (record == NULL) {
-					fclose(filep);
-					close(fd);
-					return 1;
-				}
-				continue;
-			}
-			break;
-		}
 		kvp_file_info[i].fd = fd;
-		kvp_file_info[i].num_blocks = num_blocks;
-		kvp_file_info[i].records = record;
-		kvp_file_info[i].num_records = records_read;
-		fclose(filep);
-
+		kvp_file_info[i].num_blocks = 1;
+		kvp_file_info[i].records = malloc(alloc_unit);
+		kvp_file_info[i].num_records = 0;
+		kvp_update_mem_state(i);
 	}
 
 	return 0;
Signature · 1 line
2.7.4
#1 lore raw
Quoted 9 lines · Long Li

From: Paul Meyer <[email protected]>

While reading in more than one block (50) of KVP records, the allocation goes per block, but the reads used the total number of allocated records (without resetting the pointer/stream). This causes the records buffer to overrun when the refresh reads more than one block over the previous capacity (e.g. reading more than 100 KVP records whereas the in-memory database was empty before).

Quoted 7 lines

Fix this by reading the correct number of KVP records from file each time.

---
 tools/hv/hv_kvp_daemon.c | 66 ++++++++----------------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)

When you version a patch, you always have to say what changed below the --- line, as the documentation states to do...

v3? :)

thanks,

greg k-h

#2 lore raw
Quoted 30 lines

From: Greg KH [mailto:[email protected]]
Sent: Tuesday, October 31, 2017 11:50 PM
To: Long Li <[email protected]>
Cc: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>; [email protected]; linux- [email protected]; [email protected]; Paul Meyer <[email protected]>; Long Li <[email protected]>
Subject: Re: [PATCH v2] hv: kvp: Avoid reading past allocated blocks from KVP file

Quoted 9 lines · Long Li

From: Paul Meyer <[email protected]>

While reading in more than one block (50) of KVP records, the allocation goes per block, but the reads used the total number of allocated records (without resetting the pointer/stream). This causes the records buffer to overrun when the refresh reads more than one block over the previous capacity (e.g. reading more than 100 KVP records whereas the in-memory database was empty before).

Quoted 8 lines

Fix this by reading the correct number of KVP records from file each time.

---
 tools/hv/hv_kvp_daemon.c | 66
++++++++----------------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)
Quoted 2 lines

When you version a patch, you always have to say what changed below the --- line, as the documentation states to do...

Sorry it was my bad. Can I resend v2 and indicate what has changed?

Long

Quoted 6 lines

v3? :)

thanks,

greg k-h

#3 lore raw
Quoted 30 lines · Long Li
Quoted 30 lines

From: Greg KH [mailto:[email protected]]
Sent: Tuesday, October 31, 2017 11:50 PM
To: Long Li <[email protected]>
Cc: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>; [email protected]; linux- [email protected]; [email protected]; Paul Meyer <[email protected]>; Long Li <[email protected]>
Subject: Re: [PATCH v2] hv: kvp: Avoid reading past allocated blocks from KVP file

Quoted 17 lines · Long Li

From: Paul Meyer <[email protected]>

While reading in more than one block (50) of KVP records, the allocation goes per block, but the reads used the total number of allocated records (without resetting the pointer/stream). This causes the records buffer to overrun when the refresh reads more than one block over the previous capacity (e.g. reading more than 100 KVP records whereas the in-memory database was empty before).

Fix this by reading the correct number of KVP records from file each time.

---
 tools/hv/hv_kvp_daemon.c | 66
++++++++----------------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)
Quoted 4 lines
Quoted 2 lines

When you version a patch, you always have to say what changed below the --- line, as the documentation states to do...

Sorry it was my bad. Can I resend v2 and indicate what has changed?

Why wouldn't you?

But it would be v3 then :)

greg k-h

#4 lore raw
Quoted 48 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Wednesday, November 1, 2017 11:54 AM
To: Long Li <[email protected]>
Cc: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>; [email protected]; linux- [email protected]; [email protected]; Paul Meyer <[email protected]>
Subject: Re: [PATCH v2] hv: kvp: Avoid reading past allocated blocks from KVP file

Quoted 14 lines · Long Li
Quoted 14 lines

From: Greg KH [mailto:[email protected]]
Sent: Tuesday, October 31, 2017 11:50 PM
To: Long Li <[email protected]>
Cc: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>; Stephen Hemminger <[email protected]>; [email protected]; linux- [email protected]; [email protected]; Paul Meyer <[email protected]>; Long Li <[email protected]>
Subject: Re: [PATCH v2] hv: kvp: Avoid reading past allocated blocks from KVP file

Quoted 2 lines · Long Li

From: Paul Meyer <[email protected]>

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

While reading in more than one block (50) of KVP records, the allocation goes per block, but the reads used the total number of allocated records (without resetting the pointer/stream). This causes the records buffer to overrun when the refresh reads more than one block over the previous capacity (e.g. reading more than 100 KVP records whereas the in-memory database was empty before).

Fix this by reading the correct number of KVP records from file each

time.

Quoted 12 lines
Quoted 11 lines
Quoted 7 lines
---
 tools/hv/hv_kvp_daemon.c | 66
++++++++----------------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)

When you version a patch, you always have to say what changed below the
--- line, as the documentation states to do...

Quoted 5 lines
Quoted 1 line

Sorry it was my bad. Can I resend v2 and indicate what has changed?

Why wouldn't you?

But it would be v3 then :)

I have sent a "revised v2". Please let me know if it is acceptable. If not I'll send a "v3".

Quoted 2 lines

greg k-h