xnu-1456.1.26.tar.gz

[apple/xnu.git] / iokit / Drivers / platform / drvAppleNVRAM / AppleNVRAM.cpp

diff --git a/iokit/Drivers/platform/drvAppleNVRAM/AppleNVRAM.cpp b/iokit/Drivers/platform/drvAppleNVRAM/AppleNVRAM.cpp
index 805d034bd2e5c8a24783801dd4f5ceb6eb44df5d..3391d78635fd1a93b2334db4a97b5d6e66dd198d 100644 (file)
--- a/iokit/Drivers/platform/drvAppleNVRAM/AppleNVRAM.cpp
+++ b/iokit/Drivers/platform/drvAppleNVRAM/AppleNVRAM.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2008 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -83,9 +83,9 @@ IOReturn AppleNVRAM::read(IOByteCount offset, UInt8 *buffer,
                          IOByteCount length)
 {
   UInt32 cnt;
-  
-  if ((buffer == 0) || (length <= 0) || (offset < 0) ||
-      (offset + length > kNVRAMImageSize))
+ 
+  // length and offset can't be less than zero (unsigned), so we don't check
+  if ((buffer == 0) || (length == 0) || (offset + length > kNVRAMImageSize))
     return kIOReturnBadArgument;
   
   switch (_nvramType) {
@@ -122,8 +122,8 @@ IOReturn AppleNVRAM::write(IOByteCount offset, UInt8 *buffer,
 {
   UInt32 cnt;
   
-  if ((buffer == 0) || (length <= 0) || (offset < 0) ||
-      (offset + length > kNVRAMImageSize))
+  // length and offset can't be less than zero (unsigned), so we don't check
+  if ((buffer == 0) || (length == 0) || (offset + length > kNVRAMImageSize))
     return kIOReturnBadArgument;
   
   switch (_nvramType) {