replace OVERRIDE and FINAL with override and final in sandbox/

sandbox/linux/bpf_dsl/bpf_dsl_more_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/linux/bpf_dsl/bpf_dsl.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <sched.h>
@@ skipping 95 matching lines @@
   int* counter = static_cast<int*>(aux);
   return (*counter)++;
 }
 
 class VerboseAPITestingPolicy : public SandboxBPFDSLPolicy {
  public:
   explicit VerboseAPITestingPolicy(int* counter_ptr)
       : counter_ptr_(counter_ptr) {}
   virtual ~VerboseAPITestingPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     if (sysno == __NR_uname) {
       return Trap(IncreaseCounter, counter_ptr_);
     }
     return Allow();
   }
 
  private:
   int* counter_ptr_;
 
@@ skipping 17 matching lines @@
   }
 }
 
 // A simple blacklist test
 
 class BlacklistNanosleepPolicy : public SandboxBPFDSLPolicy {
  public:
   BlacklistNanosleepPolicy() {}
   virtual ~BlacklistNanosleepPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     switch (sysno) {
       case __NR_nanosleep:
         return Error(EACCES);
       default:
         return Allow();
     }
   }
 
   static void AssertNanosleepFails() {
@@ skipping 11 matching lines @@
   BlacklistNanosleepPolicy::AssertNanosleepFails();
 }
 
 // Now do a simple whitelist test
 
 class WhitelistGetpidPolicy : public SandboxBPFDSLPolicy {
  public:
   WhitelistGetpidPolicy() {}
   virtual ~WhitelistGetpidPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     switch (sysno) {
       case __NR_getpid:
       case __NR_exit_group:
         return Allow();
       default:
         return Error(ENOMEM);
     }
   }
 
@@ skipping 18 matching lines @@
   SANDBOX_ASSERT(aux);
   *(static_cast<int*>(aux)) = kExpectedReturnValue;
   return -ENOMEM;
 }
 
 class BlacklistNanosleepTrapPolicy : public SandboxBPFDSLPolicy {
  public:
   explicit BlacklistNanosleepTrapPolicy(int* aux) : aux_(aux) {}
   virtual ~BlacklistNanosleepTrapPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     switch (sysno) {
       case __NR_nanosleep:
         return Trap(EnomemHandler, aux_);
       default:
         return Allow();
     }
   }
 
  private:
@@ skipping 21 matching lines @@
   BPF_ASSERT(*BPF_AUX == kExpectedReturnValue);
 }
 
 // A simple test that verifies we can return arbitrary errno values.
 
 class ErrnoTestPolicy : public SandboxBPFDSLPolicy {
  public:
   ErrnoTestPolicy() {}
   virtual ~ErrnoTestPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ErrnoTestPolicy);
 };
 
 ResultExpr ErrnoTestPolicy::EvaluateSyscall(int sysno) const {
   DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
   switch (sysno) {
     case __NR_dup3:  // dup2 is a wrapper of dup3 in android
 #if defined(__NR_dup2)
@@ skipping 61 matching lines @@
   BPF_ASSERT(errno == 42);
 }
 
 // Testing the stacking of two sandboxes
 
 class StackingPolicyPartOne : public SandboxBPFDSLPolicy {
  public:
   StackingPolicyPartOne() {}
   virtual ~StackingPolicyPartOne() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     switch (sysno) {
       case __NR_getppid: {
         const Arg<int> arg(0);
         return If(arg == 0, Allow()).Else(Error(EPERM));
       }
       default:
         return Allow();
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StackingPolicyPartOne);
 };
 
 class StackingPolicyPartTwo : public SandboxBPFDSLPolicy {
  public:
   StackingPolicyPartTwo() {}
   virtual ~StackingPolicyPartTwo() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     switch (sysno) {
       case __NR_getppid: {
         const Arg<int> arg(0);
         return If(arg == 0, Error(EINVAL)).Else(Allow());
       }
       default:
         return Allow();
     }
   }
@@ skipping 37 matching lines @@
   // Small contiguous sets of 3 system calls return an errno equal to the
   // index of that set + 1 (so that we never return a NUL errno).
   return ((sysno & ~3) >> 2) % 29 + 1;
 }
 
 class SyntheticPolicy : public SandboxBPFDSLPolicy {
  public:
   SyntheticPolicy() {}
   virtual ~SyntheticPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     if (sysno == __NR_exit_group || sysno == __NR_write) {
       // exit_group() is special, we really need it to work.
       // write() is needed for BPF_ASSERT() to report a useful error message.
       return Allow();
     }
     return Error(SysnoToRandomErrno(sysno));
   }
 
  private:
@@ skipping 32 matching lines @@
   } else {
     return ENOSYS;
   }
 }
 
 class ArmPrivatePolicy : public SandboxBPFDSLPolicy {
  public:
   ArmPrivatePolicy() {}
   virtual ~ArmPrivatePolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     // Start from |__ARM_NR_set_tls + 1| so as not to mess with actual
     // ARM private system calls.
     if (sysno >= static_cast<int>(__ARM_NR_set_tls + 1) &&
         sysno <= static_cast<int>(MAX_PRIVATE_SYSCALL)) {
       return Error(ArmPrivateSysnoToErrno(sysno));
     }
     return Allow();
   }
 
@@ skipping 26 matching lines @@
 }
 
 class GreyListedPolicy : public SandboxBPFDSLPolicy {
  public:
   explicit GreyListedPolicy(int* aux) : aux_(aux) {
     // Set the global environment for unsafe traps once.
     EnableUnsafeTraps();
   }
   virtual ~GreyListedPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     // Some system calls must always be allowed, if our policy wants to make
     // use of UnsafeTrap()
     if (SandboxBPF::IsRequiredForUnsafeTrap(sysno)) {
       return Allow();
     } else if (sysno == __NR_getpid) {
       // Disallow getpid()
       return Error(EPERM);
     } else {
       // Allow (and count) all other system calls.
@@ skipping 45 matching lines @@
   } else {
     return SandboxBPF::ForwardSyscall(args);
   }
 }
 
 class PrctlPolicy : public SandboxBPFDSLPolicy {
  public:
   PrctlPolicy() {}
   virtual ~PrctlPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     setenv(kSandboxDebuggingEnv, "t", 0);
     Die::SuppressInfoMessages(true);
 
     if (sysno == __NR_prctl) {
       // Handle prctl() inside an UnsafeTrap()
       return UnsafeTrap(PrctlHandler, NULL);
     }
 
     // Allow all other system calls.
@@ skipping 33 matching lines @@
 
 intptr_t AllowRedirectedSyscall(const struct arch_seccomp_data& args, void*) {
   return SandboxBPF::ForwardSyscall(args);
 }
 
 class RedirectAllSyscallsPolicy : public SandboxBPFDSLPolicy {
  public:
   RedirectAllSyscallsPolicy() {}
   virtual ~RedirectAllSyscallsPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RedirectAllSyscallsPolicy);
 };
 
 ResultExpr RedirectAllSyscallsPolicy::EvaluateSyscall(int sysno) const {
   DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
   setenv(kSandboxDebuggingEnv, "t", 0);
   Die::SuppressInfoMessages(true);
 
@@ skipping 143 matching lines @@
       BPF_ASSERT(false);
       return -ENOSYS;
   }
 }
 
 class DenyOpenPolicy : public SandboxBPFDSLPolicy {
  public:
   explicit DenyOpenPolicy(InitializedOpenBroker* iob) : iob_(iob) {}
   virtual ~DenyOpenPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
 
     switch (sysno) {
       case __NR_faccessat:
 #if defined(__NR_access)
       case __NR_access:
 #endif
 #if defined(__NR_open)
       case __NR_open:
 #endif
@@ skipping 59 matching lines @@
   BPF_ASSERT(read(cpu_info_fd, buf, sizeof(buf)) > 0);
 }
 
 // Simple test demonstrating how to use SandboxBPF::Cond()
 
 class SimpleCondTestPolicy : public SandboxBPFDSLPolicy {
  public:
   SimpleCondTestPolicy() {}
   virtual ~SimpleCondTestPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SimpleCondTestPolicy);
 };
 
 ResultExpr SimpleCondTestPolicy::EvaluateSyscall(int sysno) const {
   DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
 
   // We deliberately return unusual errno values upon failure, so that we
   // can uniquely test for these values. In a "real" policy, you would want
@@ skipping 336 matching lines @@
 #endif
   static const int kMaxFanOut = 3;
   static const int kMaxArgs = 6;
 };
 
 class EqualityStressTestPolicy : public SandboxBPFDSLPolicy {
  public:
   explicit EqualityStressTestPolicy(EqualityStressTest* aux) : aux_(aux) {}
   virtual ~EqualityStressTestPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     return aux_->Policy(sysno);
   }
 
  private:
   EqualityStressTest* aux_;
 
   DISALLOW_COPY_AND_ASSIGN(EqualityStressTestPolicy);
 };
 
 BPF_TEST(SandboxBPF,
          EqualityTests,
          EqualityStressTestPolicy,
          EqualityStressTest /* (*BPF_AUX) */) {
   BPF_AUX->VerifyFilter();
 }
 
 class EqualityArgumentWidthPolicy : public SandboxBPFDSLPolicy {
  public:
   EqualityArgumentWidthPolicy() {}
   virtual ~EqualityArgumentWidthPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EqualityArgumentWidthPolicy);
 };
 
 ResultExpr EqualityArgumentWidthPolicy::EvaluateSyscall(int sysno) const {
   DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
   if (sysno == __NR_uname) {
     const Arg<int> option(0);
     const Arg<uint32_t> arg32(1);
@@ skipping 32 matching lines @@
                  EqualityArgumentWidthPolicy) {
   Syscall::Call(__NR_uname, 0, 0x5555555555555555ULL);
 }
 #endif
 
 class EqualityWithNegativeArgumentsPolicy : public SandboxBPFDSLPolicy {
  public:
   EqualityWithNegativeArgumentsPolicy() {}
   virtual ~EqualityWithNegativeArgumentsPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     if (sysno == __NR_uname) {
       // TODO(mdempsky): This currently can't be Arg<int> because then
       // 0xFFFFFFFF will be treated as a (signed) int, and then when
       // Arg::EqualTo casts it to uint64_t, it will be sign extended.
       const Arg<unsigned> arg(0);
       return If(arg == 0xFFFFFFFF, Error(1)).Else(Error(2));
     }
     return Allow();
   }
@@ skipping 20 matching lines @@
   // iff the LSB was negative. So, this death test should error out.
   BPF_ASSERT(Syscall::Call(__NR_uname, 0xFFFFFFFF00000000LL) == -1);
 }
 #endif
 
 class AllBitTestPolicy : public SandboxBPFDSLPolicy {
  public:
   AllBitTestPolicy() {}
   virtual ~AllBitTestPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   static ResultExpr HasAllBits32(uint32_t bits);
   static ResultExpr HasAllBits64(uint64_t bits);
 
   DISALLOW_COPY_AND_ASSIGN(AllBitTestPolicy);
 };
 
 ResultExpr AllBitTestPolicy::HasAllBits32(uint32_t bits) {
   if (bits == 0) {
@@ skipping 165 matching lines @@
   BITMASK_TEST(10,         0xFFFFFFFFU, ALLBITS64,0x100000001, EXPECT_FAILURE);
   BITMASK_TEST(10,                 -1L, ALLBITS64,0x100000001, EXPT64_SUCCESS);
 #endif
 }
 
 class AnyBitTestPolicy : public SandboxBPFDSLPolicy {
  public:
   AnyBitTestPolicy() {}
   virtual ~AnyBitTestPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   static ResultExpr HasAnyBits32(uint32_t);
   static ResultExpr HasAnyBits64(uint64_t);
 
   DISALLOW_COPY_AND_ASSIGN(AnyBitTestPolicy);
 };
 
 ResultExpr AnyBitTestPolicy::HasAnyBits32(uint32_t bits) {
   if (bits == 0) {
@@ skipping 143 matching lines @@
   BITMASK_TEST( 10,        0xFFFFFFFFU, ANYBITS64,0x100000001, EXPECT_SUCCESS);
   BITMASK_TEST( 10,                -1L, ANYBITS64,0x100000001, EXPECT_SUCCESS);
 #endif
 }
 
 class MaskedEqualTestPolicy : public SandboxBPFDSLPolicy {
  public:
   MaskedEqualTestPolicy() {}
   virtual ~MaskedEqualTestPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   static ResultExpr MaskedEqual32(uint32_t mask, uint32_t value);
   static ResultExpr MaskedEqual64(uint64_t mask, uint64_t value);
 
   DISALLOW_COPY_AND_ASSIGN(MaskedEqualTestPolicy);
 };
 
 ResultExpr MaskedEqualTestPolicy::MaskedEqual32(uint32_t mask, uint32_t value) {
   const Arg<uint32_t> arg(1);
@@ skipping 106 matching lines @@
         msg);
   }
   return -EPERM;
 }
 
 class PthreadPolicyEquality : public SandboxBPFDSLPolicy {
  public:
   PthreadPolicyEquality() {}
   virtual ~PthreadPolicyEquality() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PthreadPolicyEquality);
 };
 
 ResultExpr PthreadPolicyEquality::EvaluateSyscall(int sysno) const {
   DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
   // This policy allows creating threads with pthread_create(). But it
   // doesn't allow any other uses of clone(). Most notably, it does not
   // allow callers to implement fork() or vfork() by passing suitable flags
@@ skipping 23 matching lines @@
   }
 
   return Allow();
 }
 
 class PthreadPolicyBitMask : public SandboxBPFDSLPolicy {
  public:
   PthreadPolicyBitMask() {}
   virtual ~PthreadPolicyBitMask() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE;
+  virtual ResultExpr EvaluateSyscall(int sysno) const override;
 
  private:
   static BoolExpr HasAnyBits(const Arg<unsigned long>& arg, unsigned long bits);
   static BoolExpr HasAllBits(const Arg<unsigned long>& arg, unsigned long bits);
 
   DISALLOW_COPY_AND_ASSIGN(PthreadPolicyBitMask);
 };
 
 BoolExpr PthreadPolicyBitMask::HasAnyBits(const Arg<unsigned long>& arg,
                                           unsigned long bits) {
@@ skipping 150 matching lines @@
   return 0;
 }
 
 const uint16_t kTraceData = 0xcc;
 
 class TraceAllPolicy : public SandboxBPFDSLPolicy {
  public:
   TraceAllPolicy() {}
   virtual ~TraceAllPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int system_call_number) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int system_call_number) const override {
     return Trace(kTraceData);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraceAllPolicy);
 };
 
 SANDBOX_TEST(SandboxBPF, DISABLE_ON_TSAN(SeccompRetTrace)) {
   if (SandboxBPF::SupportsSeccompSandbox(-1) !=
       sandbox::SandboxBPF::STATUS_AVAILABLE) {
@@ skipping 125 matching lines @@
   return true;
 }
 
 bool pread_64_was_forwarded = false;
 
 class TrapPread64Policy : public SandboxBPFDSLPolicy {
  public:
   TrapPread64Policy() {}
   virtual ~TrapPread64Policy() {}
 
-  virtual ResultExpr EvaluateSyscall(int system_call_number) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int system_call_number) const override {
     // Set the global environment for unsafe traps once.
     if (system_call_number == MIN_SYSCALL) {
       EnableUnsafeTraps();
     }
 
     if (system_call_number == __NR_pread64) {
       return UnsafeTrap(ForwardPreadHandler, NULL);
     }
     return Allow();
   }
@@ skipping 76 matching lines @@
 
   // Wait for the thread to finish.
   BPF_ASSERT_EQ(0, pthread_join(thread, NULL));
 }
 
 class AllowAllPolicy : public SandboxBPFDSLPolicy {
  public:
   AllowAllPolicy() {}
   virtual ~AllowAllPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     return Allow();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AllowAllPolicy);
 };
 
 SANDBOX_DEATH_TEST(
     SandboxBPF,
     StartMultiThreadedAsSingleThreaded,
@@ skipping 23 matching lines @@
 // A stub handler for the UnsafeTrap. Never called.
 intptr_t NoOpHandler(const struct arch_seccomp_data& args, void*) {
   return -1;
 }
 
 class UnsafeTrapWithCondPolicy : public SandboxBPFDSLPolicy {
  public:
   UnsafeTrapWithCondPolicy() {}
   virtual ~UnsafeTrapWithCondPolicy() {}
 
-  virtual ResultExpr EvaluateSyscall(int sysno) const OVERRIDE {
+  virtual ResultExpr EvaluateSyscall(int sysno) const override {
     DCHECK(SandboxBPF::IsValidSyscallNumber(sysno));
     setenv(kSandboxDebuggingEnv, "t", 0);
     Die::SuppressInfoMessages(true);
 
     if (SandboxBPF::IsRequiredForUnsafeTrap(sysno))
       return Allow();
 
     switch (sysno) {
       case __NR_uname: {
         const Arg<uint32_t> arg(0);
@@ skipping 35 matching lines @@
   BPF_ASSERT_EQ(ENOSYS, errno);
 
   BPF_ASSERT_EQ(-1, syscall(__NR_setgid, 300));
   BPF_ASSERT_EQ(EPERM, errno);
 }
 
 }  // namespace
 
 }  // namespace bpf_dsl
 }  // namespace sandbox