The patch titled
     uml: use correct type in BLKGETSIZE ioctl
has been removed from the -mm tree.  Its filename was
     uml-use-correct-type-in-blkgetsize-ioctl.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: uml: use correct type in BLKGETSIZE ioctl
From: Nicolas George <[EMAIL PROTECTED]>

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.

Cc: Jeff Dike <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 arch/um/os-Linux/file.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN arch/um/os-Linux/file.c~uml-use-correct-type-in-blkgetsize-ioctl 
arch/um/os-Linux/file.c
--- a/arch/um/os-Linux/file.c~uml-use-correct-type-in-blkgetsize-ioctl
+++ a/arch/um/os-Linux/file.c
@@ -320,7 +320,8 @@ int os_file_size(char *file, unsigned lo
        }
 
        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){
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are


-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to