2007-08-13 15:04:44

by Nicolas George

[permalink] [raw]
Subject: UML/man: BLKGETSIZE takes a long, not an int

Hi.

I found a type mismatch in UML that makes host block devices unusable as ubd
devices on x86_64 and other 64 bits systems (segfault of the mm subsystem):

In block/ioctl.c, the following lines show that the BLKGETSIZE ioctl expects
a pointer to a long:

case BLKGETSIZE:
if ((bdev->bd_inode->i_size >> 9) > ~0UL)
return -EFBIG;
return put_ulong(arg, bdev->bd_inode->i_size >> 9);

In arch/um/os-Linux/file.c, os_file_size calls it with an int.

The ioctl_list man page should be fixed as well.

Regards,

--
Nicolas George


Attachments:
(No filename) (0.00 B)
signature.asc (189.00 B)
Digital signature
Download all attachments

2007-08-15 17:13:38

by Jeff Dike

[permalink] [raw]
Subject: Re: UML/man: BLKGETSIZE takes a long, not an int

On Mon, Aug 13, 2007 at 02:42:47PM +0200, Nicolas George wrote:
> I found a type mismatch in UML that makes host block devices unusable as ubd
> devices on x86_64 and other 64 bits systems (segfault of the mm subsystem):

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

Jeff

--
Work email - jdike at linux dot intel dot com

2007-08-15 21:38:59

by Nicolas George

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

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 <[email protected]>

---

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){

2007-08-16 14:49:28

by Jeff Dike

[permalink] [raw]
Subject: Re: [PATCH] UML: BLKGETSIZE takes a long, not an int

On Wed, Aug 15, 2007 at 11:38:25PM +0200, Nicolas George wrote:
> Here is the hopefully correct patch, against current git.

Thanks, I'll forward it upstream.

Jeff

--
Work email - jdike at linux dot intel dot com