[PATCH] UML: BLKGETSIZE takes a long, not an int

From: Nicolas George
Date: Wed Aug 15 2007 - 17:39:05 EST


The BLKGETSIZE ioctl expects a pointer to a long, os_file_size was providing
an int. Therefore, ubd access to host block devices caused a segmentation
fault on 64 bits systems.

Signed-off-by: Nicolas George <nicolas.george@xxxxxxxxxxxxxx>

---

Jeff Dike wrote:
> Looks sane, can I have a properly Signed-off-by: version of the patch?

Of course. I should have sent it correctly the first time. And I am terribly
sorry for the mess my mailer have done with my second mail.

Here is the hopefully correct patch, against current git.

Regards.

diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index 6f92f73..c3ecc2a 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -320,7 +320,8 @@ int os_file_size(char *file, unsigned long long *size_out)
}

if(S_ISBLK(buf.ust_mode)){
- int fd, blocks;
+ int fd;
+ long blocks;

fd = os_open_file(file, of_read(OPENFLAGS()), 0);
if(fd < 0){
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/