Re: [PATCH] MdeModulePkg/RamDiskDxe: Perform MediaId check first in BlkIo services

["Ni, Ruiyu" <ruiyu.ni@Intel.com>]

On 2/24/2018 8:48 AM, Hao Wu wrote:
> The commit places the check for MediaId at the beginning of Block IO
> services:
> RamDiskBlkIoReadBlocks and
> RamDiskBlkIoWriteBlocks
> 
> This aligns with the Block IO protocol implementations for other
> devices.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
>   .../Universal/Disk/RamDiskDxe/RamDiskBlockIo.c     | 30 +++++++++++-----------
>   1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
> index f36e1c8ff2..4f74b5ef15 100644
> --- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
> +++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskBlockIo.c
> @@ -1,7 +1,7 @@
>   /** @file
>     Produce EFI_BLOCK_IO_PROTOCOL on a RAM disk device.
>   
> -  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
>     This program and the accompanying materials
>     are licensed and made available under the terms and conditions of the BSD License
>     which accompanies this distribution.  The full text of the license may be found at
> @@ -137,6 +137,12 @@ RamDiskBlkIoReadBlocks (
>     RAM_DISK_PRIVATE_DATA           *PrivateData;
>     UINTN                           NumberOfBlocks;
>   
> +  PrivateData = RAM_DISK_PRIVATE_FROM_BLKIO (This);
> +
> +  if (MediaId != PrivateData->Media.MediaId) {
> +    return EFI_MEDIA_CHANGED;
> +  }
> +
>     if (Buffer == NULL) {
>       return EFI_INVALID_PARAMETER;
>     }
> @@ -145,12 +151,6 @@ RamDiskBlkIoReadBlocks (
>       return EFI_SUCCESS;
>     }
>   
> -  PrivateData = RAM_DISK_PRIVATE_FROM_BLKIO (This);
> -
> -  if (MediaId != PrivateData->Media.MediaId) {
> -    return EFI_MEDIA_CHANGED;
> -  }
> -
>     if ((BufferSize % PrivateData->Media.BlockSize) != 0) {
>       return EFI_BAD_BUFFER_SIZE;
>     }
> @@ -212,14 +212,6 @@ RamDiskBlkIoWriteBlocks (
>     RAM_DISK_PRIVATE_DATA           *PrivateData;
>     UINTN                           NumberOfBlocks;
>   
> -  if (Buffer == NULL) {
> -    return EFI_INVALID_PARAMETER;
> -  }
> -
> -  if (BufferSize == 0) {
> -    return EFI_SUCCESS;
> -  }
> -
>     PrivateData = RAM_DISK_PRIVATE_FROM_BLKIO (This);
>   
>     if (MediaId != PrivateData->Media.MediaId) {
> @@ -230,6 +222,14 @@ RamDiskBlkIoWriteBlocks (
>       return EFI_WRITE_PROTECTED;
>     }
>   
> +  if (Buffer == NULL) {
> +    return EFI_INVALID_PARAMETER;
> +  }
> +
> +  if (BufferSize == 0) {
> +    return EFI_SUCCESS;
> +  }
> +
>     if ((BufferSize % PrivateData->Media.BlockSize) != 0) {
>       return EFI_BAD_BUFFER_SIZE;
>     }
> 
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

-- 
Thanks,
Ray