ozone: Implement zero/one-copy texture for Ozone GBM.

sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc

Index: sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
index 58ffb843a8717c9f659d95db465b0c56a9f3a3b3..dec1b355f212e5da6ee535b90b5c81e25887b210 100644
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
@@ -35,6 +35,9 @@
 // PNaCl toolchain does not provide sys/ioctl.h header.
 #if !defined(OS_NACL_NONSFI)
 #include <sys/ioctl.h>
+#if defined(USE_OZONE)
+#include <drm.h>
+#endif
 #endif
 
 #if defined(OS_ANDROID)
@@ -150,9 +153,21 @@ ResultExpr RestrictPrctl() {
 }
 
 ResultExpr RestrictIoctl() {

[spang, 2015/07/24 22:08:25]

I think you should split sandbox changes into a separate CL (for now, you can
say test with --no-sandbox in the description).

But anyway, I think as far as whitelisting the 3 ioctls, what you want is:

ResultExpr RestrictIoctl() {
  auto reference_type = TCGETS;
  const Arg<decltype(reference_type)> request(1);
  return Switch(request)
      .CASES(((decltype(reference_type))TCGETS, FIONREAD), Allow())
#if defined(OS_CHROMEOS)
      .CASES(((decltype(reference_type))DRM_IOCTL_GEM_CLOSE,
              DRM_IOCTL_VGEM_MODE_MAP_DUMB, DRM_IOCTL_PRIME_FD_TO_HANDLE),
             Allow())
#endif
      .Default(CrashSIGSYSIoctl());
}

[dshwang, 2015/07/28 15:23:12]

correct. I separate this part into https://codereview.chromium.org/1253363004
following code is needed because TCGETS is 32bit int but DRM_IOCTL_GEM_CLOSE is
64bit int.
cast like "(decltype(reference_type))DRM_IOCTL_GEM_CLOSE" trims upper 32bit and
causes unexpected behavior.

#if defined(OZONE_USE_VGEM_MAP)
  auto reference_type = DRM_IOCTL_GEM_CLOSE;
#else
  auto reference_type = TCGETS;
#endif

-  const Arg<int> request(1);
-  return Switch(request).CASES((TCGETS, FIONREAD), Allow()).Default(
-      CrashSIGSYSIoctl());
+// The type of DRM_IOCTL_XXX macro is long unsigned int.
+#if defined(USE_OZONE)
+  auto reference_type = DRM_IOCTL_MODE_MAP_DUMB;
+#else
+  auto reference_type = TCGETS;
+#endif
+  const Arg<decltype(reference_type)> request(1);
+  return Switch(request)
+      .CASES(((decltype(reference_type))TCGETS, FIONREAD), Allow())
+#if defined(USE_OZONE)
+      .CASES((DRM_IOCTL_MODE_DESTROY_DUMB, DRM_IOCTL_MODE_MAP_DUMB,
+              DRM_IOCTL_PRIME_FD_TO_HANDLE),
+             Allow())
+#endif
+      .Default(CrashSIGSYSIoctl());
 }
 
 ResultExpr RestrictMmapFlags() {