[MSAN] extend ioctl interceptor to support BLKSSZGET

[kda]

compiler-rt/lib/msan/tests/msan_test.cpp

714 ↗

(On Diff #411951)

Is there a device I can easily use to make this function work correctly?

[eugenis]

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

605

Please add it to the list instead (the same as done for the other BLK* ioctls).
Also, could you check for more missing BLK ioctls? I see at least a couple in the system header.

[eugenis]

compiler-rt/lib/msan/tests/msan_test.cpp

714 ↗

(On Diff #411951)

I'd say it's ok not to test it if it is hard to set up. Especially if you don't add any extra code, only a list entry.

[kda]

added to list and dropped test
add a few other BLK ioctls

[kda]

compiler-rt/lib/msan/tests/msan_test.cpp

714 ↗

(On Diff #411951)

Dropping test.

[eugenis]

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

123

some of these are wrong: *SET read from the argument, *GET write to the argument.

Also, some types are wrong, including in the existing code!

BLKRAGET / BLKFRAGET uses uptr,
BLKSECTGET uses short
BLKBSZGET uses int
BLKGETSIZE64 uses u64

Please double check against the kernel source.

128

uptr instead of SIZE_TYPE

[kda]

adjusted types and READ/WRITE

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

123

Oh. That is embarrassing. Thank you.

I used this for the Linux code: https://elixir.bootlin.com/linux/latest/source/block/ioctl.c#L500
Is that the right place?

[eugenis]

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

123

No problem! Some of these are still wrong though.
BLKFRASET should be NONE
BLKRAGET / BLKFRAGET should use uptr

[kda]

a few more adjustments

[eugenis]

LGTM

compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc

#if SANITIZER_LINUX
   // _(SNDCTL_TMR_START, NONE, 0);
   // _(SNDCTL_TMR_STOP, NONE, 0);
   // _(SOUND_MIXER_READ_LOUD, WRITE, sizeof(int)); // same as ...READ_ENHANCE
   // _(SOUND_MIXER_READ_MUTE, WRITE, sizeof(int)); // same as ...READ_ENHANCE
   // _(SOUND_MIXER_WRITE_LOUD, WRITE, sizeof(int)); // same as ...WRITE_ENHANCE
   // _(SOUND_MIXER_WRITE_MUTE, WRITE, sizeof(int)); // same as ...WRITE_ENHANCE
   _(BLKFLSBUF, NONE, 0);
   _(BLKGETSIZE, WRITE, sizeof(uptr));
-  _(BLKRAGET, WRITE, sizeof(int));
+  _(BLKRAGET, WRITE, sizeof(uptr));
   _(BLKRASET, NONE, 0);
   _(BLKROGET, WRITE, sizeof(int));
   _(BLKROSET, READ, sizeof(int));
   _(BLKRRPART, NONE, 0);
+  _(BLKFRASET, NONE, 0);
+  _(BLKFRAGET, WRITE, sizeof(uptr));
+  _(BLKSECTSET, READ, sizeof(short));
+  _(BLKSECTGET, WRITE, sizeof(short));
+  _(BLKSSZGET, WRITE, sizeof(int));
+  _(BLKBSZGET, WRITE, sizeof(int));
+  _(BLKBSZSET, READ, sizeof(uptr));
+  _(BLKGETSIZE64, WRITE, sizeof(u64));
   _(CDROMEJECT, NONE, 0);
   _(CDROMEJECT_SW, NONE, 0);
   _(CDROMMULTISESSION, WRITE, struct_cdrom_multisession_sz);
   _(CDROMPAUSE, NONE, 0);
   _(CDROMPLAYMSF, READ, struct_cdrom_msf_sz);
   _(CDROMPLAYTRKIND, READ, struct_cdrom_ti_sz);
   _(CDROMREADAUDIO, READ, struct_cdrom_read_audio_sz);
   _(CDROMREADCOOKED, READ, struct_cdrom_msf_sz);

 static void ioctl_common_post(void *ctx, const ioctl_desc *desc, int res, int d,
                               unsigned request, void *arg) {
   if (desc->type == ioctl_desc::WRITE || desc->type == ioctl_desc::READWRITE) {
     // FIXME: add verbose output
     unsigned size = desc->size ? desc->size : IOC_SIZE(request);
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, arg, size);
   }
   if (desc->type != ioctl_desc::CUSTOM)
     return;
   if (request == IOCTL_SIOCGIFCONF) {
     struct __sanitizer_ifconf *ifc = (__sanitizer_ifconf *)arg;
     COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ifc->ifc_ifcu.ifcu_req, ifc->ifc_len);
   }
 }
 
 #endif

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

 extern unsigned IOCTL_EVIOCSREP;
 extern unsigned IOCTL_BLKFLSBUF;
 extern unsigned IOCTL_BLKGETSIZE;
 extern unsigned IOCTL_BLKRAGET;
 extern unsigned IOCTL_BLKRASET;
 extern unsigned IOCTL_BLKROGET;
 extern unsigned IOCTL_BLKROSET;
 extern unsigned IOCTL_BLKRRPART;
+extern unsigned IOCTL_BLKFRASET;
+extern unsigned IOCTL_BLKFRAGET;
+extern unsigned IOCTL_BLKSECTSET;
+extern unsigned IOCTL_BLKSECTGET;
+extern unsigned IOCTL_BLKSSZGET;
+extern unsigned IOCTL_BLKBSZGET;
+extern unsigned IOCTL_BLKBSZSET;
+extern unsigned IOCTL_BLKGETSIZE64;
 extern unsigned IOCTL_CDROMAUDIOBUFSIZ;
 extern unsigned IOCTL_CDROMEJECT;
 extern unsigned IOCTL_CDROMEJECT_SW;
 extern unsigned IOCTL_CDROMMULTISESSION;
 extern unsigned IOCTL_CDROMPAUSE;
 extern unsigned IOCTL_CDROMPLAYMSF;
 extern unsigned IOCTL_CDROMPLAYTRKIND;
 extern unsigned IOCTL_CDROMREADAUDIO;

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

#if SANITIZER_LINUX
   unsigned IOCTL_EVIOCSREP = EVIOCSREP;
   unsigned IOCTL_BLKFLSBUF = BLKFLSBUF;
   unsigned IOCTL_BLKGETSIZE = BLKGETSIZE;
   unsigned IOCTL_BLKRAGET = BLKRAGET;
   unsigned IOCTL_BLKRASET = BLKRASET;
   unsigned IOCTL_BLKROGET = BLKROGET;
   unsigned IOCTL_BLKROSET = BLKROSET;
   unsigned IOCTL_BLKRRPART = BLKRRPART;
+  unsigned IOCTL_BLKFRASET = BLKFRASET;
+  unsigned IOCTL_BLKFRAGET = BLKFRAGET;
+  unsigned IOCTL_BLKSECTSET = BLKSECTSET;
+  unsigned IOCTL_BLKSECTGET = BLKSECTGET;
+  unsigned IOCTL_BLKSSZGET = BLKSSZGET;
+  unsigned IOCTL_BLKBSZGET = BLKBSZGET;
+  unsigned IOCTL_BLKBSZSET = BLKBSZSET;
+  unsigned IOCTL_BLKGETSIZE64 = BLKGETSIZE64;
   unsigned IOCTL_CDROMAUDIOBUFSIZ = CDROMAUDIOBUFSIZ;
   unsigned IOCTL_CDROMEJECT = CDROMEJECT;
   unsigned IOCTL_CDROMEJECT_SW = CDROMEJECT_SW;
   unsigned IOCTL_CDROMMULTISESSION = CDROMMULTISESSION;
   unsigned IOCTL_CDROMPAUSE = CDROMPAUSE;
   unsigned IOCTL_CDROMPLAYMSF = CDROMPLAYMSF;
   unsigned IOCTL_CDROMPLAYTRKIND = CDROMPLAYTRKIND;
   unsigned IOCTL_CDROMREADAUDIO = CDROMREADAUDIO;