Handle the BLKGETSIZE64 ioctl. Fixes bug #104797.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4161

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 2f7417ab767a7bdad3e038a27ed5c42cf4d96b21..43a8a5a3beb390e39be959ad36f745c5ba9d6651 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -3444,6 +3444,9 @@ PRE(sys_ioctl)
    case VKI_BLKGETSIZE:
       PRE_MEM_WRITE( "ioctl(BLKGETSIZE)", ARG3, sizeof(unsigned long));
       break;
+   case VKI_BLKGETSIZE64:
+      PRE_MEM_WRITE( "ioctl(BLKGETSIZE64)", ARG3, sizeof(unsigned long long));
+      break;
 
       /* Hard disks */
    case VKI_HDIO_GET_IDENTITY: /* 0x030d */
@@ -4086,6 +4089,9 @@ POST(sys_ioctl)
    case VKI_BLKGETSIZE:
       POST_MEM_WRITE(ARG3, sizeof(unsigned long));
       break;
+   case VKI_BLKGETSIZE64:
+      POST_MEM_WRITE(ARG3, sizeof(unsigned long long));
+      break;
 
       /* Hard disks */
    case VKI_HDIO_GET_IDENTITY: /* 0x030d */

diff --git a/include/vki-linux.h b/include/vki-linux.h
index 951fb24ca37c3c5f9348004c3b2f47f6b9f8a4dc..343214119328746d83724114419547c638ae7c60 100644 (file)
--- a/include/vki-linux.h
+++ b/include/vki-linux.h
@@ -1424,6 +1424,7 @@ struct vki_ppdev_frob_struct {
 //----------------------------------------------------------------------
 
 #define VKI_BLKGETSIZE _VKI_IO(0x12,96) /* return device size /512 (long *arg) */
+#define VKI_BLKGETSIZE64 _VKI_IOR(0x12,114, vki_size_t) /* return device size in bytes (u64 *arg) */
 
 #define VKI_FIBMAP     _VKI_IO(0x00,1) /* bmap access */
 #define VKI_FIGETBSZ    _VKI_IO(0x00,2)        /* get the block size used for bmap */