Attachment 298559 Details for Bug 438056 – patch to make read continue until error or complete read

[patch] patch to make read continue until error or complete read

makedumpfile-safe_read.patch (text/plain), 8.07 KB, created by Neil Horman on 2008-03-19 18:04:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2008-03-19 18:04:24 UTC

Size: 8.07 KB

patch

obsolete

>diff -up kexec-tools-testing-20070330/makedumpfile/makedumpfile.c.orig kexec-tools-testing-20070330/makedumpfile/makedumpfile.c
>--- kexec-tools-testing-20070330/makedumpfile/makedumpfile.c.orig	2008-03-19 11:52:17.000000000 -0400
>+++ kexec-tools-testing-20070330/makedumpfile/makedumpfile.c	2008-03-19 11:58:16.000000000 -0400
>@@ -38,6 +38,23 @@ show_version()
> 	MSG("\n");
> }
> 
>+ssize_t safe_read (int fd, void *buf, size_t nbytes)
>+{
>+	ssize_t rc = 0;
>+	size_t bytes = nbytes;
>+	void *tbuf = buf;
>+
>+	do {
>+		rc = read(fd, tbuf, bytes); 
>+		if (rc == -1)
>+			return rc;
>+		bytes -= rc;
>+		tbuf += rc;
>+	} while (bytes > 0);
>+	
>+	return nbytes;	
>+}
>+
> /*
>  * Convert Physical Address to File Offset.
>  *  If this function returns 0x0, File Offset isn't found.
>@@ -230,7 +247,7 @@ readmem(int type_addr, unsigned long lon
> 		return FALSE;
> 	}
> 
>-	if (read(info->fd_memory, bufptr, size) != size) {
>+	if (safe_read(info->fd_memory, bufptr, size) != size) {
> 		ERRMSG("Can't read the dump memory(%s). %s\n",
> 		    info->name_memory, strerror(errno));
> 		return FALSE;
>@@ -661,7 +678,7 @@ get_elf64_ehdr(Elf64_Ehdr *ehdr)
> 		    info->name_memory, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(info->fd_memory, ehdr, sizeof(Elf64_Ehdr))
>+	if (safe_read(info->fd_memory, ehdr, sizeof(Elf64_Ehdr))
> 	    != sizeof(Elf64_Ehdr)) {
> 		ERRMSG("Can't read the dump memory(%s). %s\n",
> 		    info->name_memory, strerror(errno));
>@@ -686,7 +703,7 @@ get_elf64_phdr(int fd, char *filename, i
> 		ERRMSG("Can't seek %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(fd, phdr, sizeof(Elf64_Phdr)) != sizeof(Elf64_Phdr)) {
>+	if (safe_read(fd, phdr, sizeof(Elf64_Phdr)) != sizeof(Elf64_Phdr)) {
> 		ERRMSG("Can't read %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>@@ -729,7 +746,7 @@ get_elf32_ehdr(Elf32_Ehdr *ehdr)
> 		    info->name_memory, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(info->fd_memory, ehdr, sizeof(Elf32_Ehdr))
>+	if (safe_read(info->fd_memory, ehdr, sizeof(Elf32_Ehdr))
> 	    != sizeof(Elf32_Ehdr)) {
> 		ERRMSG("Can't read the dump memory(%s). %s\n",
> 		    info->name_memory, strerror(errno));
>@@ -754,7 +771,7 @@ get_elf32_phdr(int fd, char *filename, i
> 		ERRMSG("Can't seek %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(fd, phdr, sizeof(Elf32_Phdr)) != sizeof(Elf32_Phdr)) {
>+	if (safe_read(fd, phdr, sizeof(Elf32_Phdr)) != sizeof(Elf32_Phdr)) {
> 		ERRMSG("Can't read %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>@@ -775,7 +792,7 @@ check_elf_format(int fd, char *filename,
> 		ERRMSG("Can't seek %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(fd, &ehdr64, sizeof(Elf64_Ehdr)) != sizeof(Elf64_Ehdr)) {
>+	if (safe_read(fd, &ehdr64, sizeof(Elf64_Ehdr)) != sizeof(Elf64_Ehdr)) {
> 		ERRMSG("Can't read %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>@@ -783,7 +800,7 @@ check_elf_format(int fd, char *filename,
> 		ERRMSG("Can't seek %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(fd, &ehdr32, sizeof(Elf32_Ehdr)) != sizeof(Elf32_Ehdr)) {
>+	if (safe_read(fd, &ehdr32, sizeof(Elf32_Ehdr)) != sizeof(Elf32_Ehdr)) {
> 		ERRMSG("Can't read %s. %s\n", filename, strerror(errno));
> 		return FALSE;
> 	}
>@@ -1915,7 +1932,7 @@ get_str_osrelease_from_vmlinux()
> 		    strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(dwarf_info.vmlinux_fd, &system_utsname, sizeof system_utsname)
>+	if (safe_read(dwarf_info.vmlinux_fd, &system_utsname, sizeof system_utsname)
> 	    != sizeof system_utsname) {
> 		ERRMSG("Can't read %s. %s\n", dwarf_info.vmlinux_name,
> 		    strerror(errno));
>@@ -2394,21 +2411,21 @@ is_vmcoreinfo_in_vmcore(int *flag_found)
> 			return FALSE;
> 		}
> 		if (flag_elf64) {
>-			if (read(info->fd_memory, &note64, sizeof(note64))
>+			if (safe_read(info->fd_memory, &note64, sizeof(note64))
> 			    != sizeof(note64)) {
> 				ERRMSG("Can't read the dump memory(%s). %s\n",
> 				    info->name_memory, strerror(errno));
> 				return FALSE;
> 			}
> 		} else {
>-			if (read(info->fd_memory, &note32, sizeof(note32))
>+			if (safe_read(info->fd_memory, &note32, sizeof(note32))
> 			    != sizeof(note32)) {
> 				ERRMSG("Can't read the dump memory(%s). %s\n",
> 				    info->name_memory, strerror(errno));
> 				return FALSE;
> 			}
> 		}
>-		if (read(info->fd_memory, &buf, sizeof(buf)) != sizeof(buf)) {
>+		if (safe_read(info->fd_memory, &buf, sizeof(buf)) != sizeof(buf)) {
> 			ERRMSG("Can't read the dump memory(%s). %s\n",
> 			    info->name_memory, strerror(errno));
> 			return FALSE;
>@@ -2465,7 +2482,7 @@ copy_vmcoreinfo()
> 		    info->name_memory, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(info->fd_memory, &buf, info->size_vmcoreinfo)
>+	if (safe_read(info->fd_memory, &buf, info->size_vmcoreinfo)
> 	    != info->size_vmcoreinfo) {
> 		ERRMSG("Can't read the dump memory(%s). %s\n",
> 		    info->name_memory, strerror(errno));
>@@ -3278,7 +3295,7 @@ is_dumpable(struct dump_bitmap *bitmap, 
> 	if (pfn == 0 || bitmap->no_block != pfn/PFN_BUFBITMAP) {
> 		offset = bitmap->offset + BUFSIZE_BITMAP*(pfn/PFN_BUFBITMAP);
> 		lseek(bitmap->fd, offset, SEEK_SET);
>-		read(bitmap->fd, bitmap->buf, BUFSIZE_BITMAP);
>+		safe_read(bitmap->fd, bitmap->buf, BUFSIZE_BITMAP);
> 		if (pfn == 0)
> 			bitmap->no_block = 0;
> 		else
>@@ -3323,7 +3340,7 @@ read_cache(struct cache_data *cd)
> 		    cd->file_name, strerror(errno));
> 		return FALSE;
> 	}
>-	if (read(cd->fd, cd->buf, cd->cache_size) != cd->cache_size) {
>+	if (safe_read(cd->fd, cd->buf, cd->cache_size) != cd->cache_size) {
> 		ERRMSG("Can't read the dump file(%s). %s\n",
> 		    cd->file_name, strerror(errno));
> 		return FALSE;
>@@ -3426,7 +3443,7 @@ read_buf_from_stdin(void *buf, int buf_s
> 
> 	while (read_size != buf_size) {
> 
>-		tmp_read_size = read(STDIN_FILENO, buf + read_size,
>+		tmp_read_size = safe_read(STDIN_FILENO, buf + read_size,
> 		    buf_size - read_size); 
> 
> 		if (tmp_read_size < 0) {
>@@ -3991,7 +4008,7 @@ create_dump_bitmap()
> 					    info->name_memory, strerror(errno));
> 					goto out;
> 				}
>-				if (read(info->fd_memory, buf, info->page_size)
>+				if (safe_read(info->fd_memory, buf, info->page_size)
> 				    != info->page_size) {
> 					ERRMSG("Can't read the dump memory(%s). %s\n",
> 					    info->name_memory, strerror(errno));
>@@ -4368,7 +4385,7 @@ write_elf_header()
> 		    info->name_memory, strerror(errno));
> 		goto out;
> 	}
>-	if (read(info->fd_memory, buf, size_note) != size_note) {
>+	if (safe_read(info->fd_memory, buf, size_note) != size_note) {
> 		ERRMSG("Can't read the dump memory(%s). %s\n",
> 		    info->name_memory, strerror(errno));
> 		goto out;
>@@ -4682,7 +4699,7 @@ write_elf_pages()
> 				else
> 					bufsz_write = bufsz_remain;
> 
>-				if (read(info->fd_memory, buf, bufsz_write)
>+				if (safe_read(info->fd_memory, buf, bufsz_write)
> 				    != bufsz_write) {
> 					ERRMSG("Can't read the dump memory(%s). %s\n",
> 					    info->name_memory, strerror(errno));
>@@ -4779,7 +4796,7 @@ write_elf_pages()
> 			else
> 				bufsz_write = bufsz_remain;
> 
>-			if (read(info->fd_memory, buf, bufsz_write)
>+			if (safe_read(info->fd_memory, buf, bufsz_write)
> 			    != bufsz_write) {
> 				ERRMSG("Can't read the dump memory(%s). %s\n",
> 				    info->name_memory, strerror(errno));
>@@ -4979,7 +4996,7 @@ write_kdump_pages()
> 			    info->name_memory, strerror(errno));
> 			goto out;
> 		}
>-		if (read(info->fd_memory, buf, info->page_size)
>+		if (safe_read(info->fd_memory, buf, info->page_size)
> 		    != info->page_size) {
> 			ERRMSG("Can't read the dump memory(%s). %s\n",
> 			    info->name_memory, strerror(errno));
>@@ -5690,7 +5707,7 @@ create_dump_bitmap_xen()
> 					    info->name_memory, strerror(errno));
> 					goto out;
> 				}
>-				if (read(info->fd_memory, buf, info->page_size)
>+				if (safe_read(info->fd_memory, buf, info->page_size)
> 				    != info->page_size) {
> 					ERRMSG("Can't read the dump memory(%s). %s\n",
> 					    info->name_memory, strerror(errno));
>@@ -5724,7 +5741,7 @@ create_dump_bitmap_xen()
> 					        info->name_memory, strerror(errno));
> 					goto out;
> 				}
>-				if (read(info->fd_memory, buf, info->page_size)
>+				if (safe_read(info->fd_memory, buf, info->page_size)
> 					 != info->page_size) {
> 					ERRMSG("Can't read the dump memory(%s). %s\n",
> 						info->name_memory, strerror(errno));

Actions: View | Diff

Attachments on bug 438056: 298450 | 298559 | 298698 | 298718 | 301320 | 306002