Skip to contentSkip to conversation

makedumpfile: bugfix: fix a div-by-zero problem

PATCH In review Wang Nan 2 participants 2 messages Apr 4, 2014 – Apr 8, 2014

Subsystems (2)
lore
Share & tools
lore

Wang Nan

author
#0 lore raw

PATCH 1/1 makedumpfile: bugfix: fix a div-by-zero problem

In makedumpfile.c, we want the progress printed 10000 times. It is tested by:

(num_dumped % per) == 0

where per is num_dumpable / 10000.

However, if num_dumpable less than 10000, num_dumped % per causes a divide-by-zero problem, triggers a SIGFPE.

This patch makes sure per never be 0.

Cc Atsushi Kumagai <[email protected]>
Cc Geng Hui <[email protected]>
Cc Simon Horman <[email protected]>
---
 makedumpfile.c | 4 ++++
 1 file changed, 4 insertions(+)
makedumpfile.c +4 -0
index 23251a1..d71977a 100644
@@ -5621,6 +5621,7 @@ write_elf_pages(struct cache_data *cd_header, struct cache_data *cd_page)
 
 	num_dumpable = get_num_dumpable();
 	per = num_dumpable / 10000;
+	per = per ? per : 1;
 
 	off_seg_load    = info->offset_load_dumpfile;
 	cd_page->offset = info->offset_load_dumpfile;
@@ -5906,6 +5907,7 @@ write_elf_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_page)
 
 	num_dumpable = info->num_dumpable;
 	per = num_dumpable / 10000;
+	per = per ? per : 1;
 
 	off_seg_load   = info->offset_load_dumpfile;
 	cd_page->offset = info->offset_load_dumpfile;
@@ -6164,6 +6166,7 @@ write_kdump_pages(struct cache_data *cd_header, struct cache_data *cd_page)
 
 	num_dumpable = get_num_dumpable();
 	per = num_dumpable / 10000;
+	per = per ? per : 1;
 
 	/*
 	 * Calculate the offset of the page data.
@@ -6365,6 +6368,7 @@ write_kdump_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_pag
 	}
 
 	per = info->num_dumpable / 10000;
+	per = per ? per : 1;
 
 	/*
 	 * Set a fileoffset of Physical Address 0x0.
Signature · 7 lines
1.8.4


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines

In makedumpfile.c, we want the progress printed 10000 times. It is tested by:

(num_dumped % per) == 0

where per is num_dumpable / 10000.

However, if num_dumpable less than 10000, num_dumped % per causes a divide-by-zero problem, triggers a SIGFPE.

This patch makes sure per never be 0.

Good fix, thanks.

Quoted 46 lines
Cc Atsushi Kumagai <[email protected]>
Cc Geng Hui <[email protected]>
Cc Simon Horman <[email protected]>

---
makedumpfile.c | 4 ++++

1 file changed, 4 insertions(+)
makedumpfile.c +4 -1
index 23251a1..d71977a 100644
@@ -5621,6 +5621,7 @@ write_elf_pages(struct cache_data *cd_header, struct cache_data *cd_page)
 
 	num_dumpable = get_num_dumpable();
 	per = num_dumpable / 10000;
+	per = per ? per : 1;
 
 	off_seg_load    = info->offset_load_dumpfile;
 	cd_page->offset = info->offset_load_dumpfile;
@@ -5906,6 +5907,7 @@ write_elf_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_page)
 
 	num_dumpable = info->num_dumpable;
 	per = num_dumpable / 10000;
+	per = per ? per : 1;
 
 	off_seg_load   = info->offset_load_dumpfile;
 	cd_page->offset = info->offset_load_dumpfile;
@@ -6164,6 +6166,7 @@ write_kdump_pages(struct cache_data *cd_header, struct cache_data *cd_page)
 
 	num_dumpable = get_num_dumpable();
 	per = num_dumpable / 10000;
+	per = per ? per : 1;
 
 	/*
 	 * Calculate the offset of the page data.
@@ -6365,6 +6368,7 @@ write_kdump_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_pag
 	}
 
 	per = info->num_dumpable / 10000;
+	per = per ? per : 1;
 
 	/*
 	 * Set a fileoffset of Physical Address 0x0.
--
Quoted 1 line

1.8.4

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec