UML/man: BLKGETSIZE takes a long, not an int

UML/man: BLKGETSIZE takes a long, not an int

[Nicolas George]

[-- Attachment #1.1: Type: text/plain, Size: 559 bytes --]

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

[-- Attachment #1.2: linux-umlblkgetsize-20070813.diff --]
[-- Type: text/x-diff, Size: 397 bytes --]

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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: UML/man: BLKGETSIZE takes a long, not an int

[Jeff Dike]

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

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

[Nicolas George]

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@normalesup.org>

---

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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

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

[Nicolas George]

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@normalesup.org>

---

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

Re: [uml-devel] [PATCH] UML: BLKGETSIZE takes a long, not an int

[Jeff Dike]

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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

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

[Jeff Dike]

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

(no subject)

[Nicolas George]

[-- Attachment #1.1: Type: text/plain, Size: 966 bytes --]

Cc: 
Bcc: 
Subject: Re: UML/man: BLKGETSIZE takes a long, not an int
Reply-To: 
In-Reply-To: <20070813124247.GA7414@she-seel.salle-s.org>

Hi.

I fear that my bug-report yesterday was very badly written, with me writing
to the wrong mailing-list and all.

I was saying:

> 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.

I add that the bug was still there yesterday in the git repository.

I join the patch to file.c.

Regards,

-- 
  Nicolas George

[-- Attachment #1.2: linux-umlblkgetsize-20070813.diff --]
[-- Type: text/plain, Size: 397 bytes --]

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

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 185 bytes --]

Re: UML/man: BLKGETSIZE takes a long, not an int

[Michael Kerrisk]

Hello Nicolas,

> I fear that my bug-report yesterday was very badly written, with me writing
> to the wrong mailing-list and all.
> 
> I was saying:
> 
>> 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.

manual page changed for 2.65:

--- ioctl_list.2
+++ ioctl_list.2        (working copy)
@@ -243,7 +243,7 @@
 0x0000125D  BLKROSET                   const int *
 0x0000125E  BLKROGET                   int *
 0x0000125F  BLKRRPART                  void
-0x00001260  BLKGETSIZE                 int *
+0x00001260  BLKGETSIZE                 unsigned long *
 0x00001261  BLKFLSBUF                  void
 0x00001262  BLKRASET                   int
 0x00001263  BLKRAGET                   int *

Thanks,

Michael

-- 
Michael Kerrisk
maintainer of Linux man pages Sections 2, 3, 4, 5, and 7

Want to help with man page maintenance?  Grab the latest tarball at
http://www.kernel.org/pub/linux/docs/manpages/
read the HOWTOHELP file and grep the source files for 'FIXME'.