qga: fix an off-by-one issue

[Qemu-devel] [PATCH] qga: fix an off-by-one issue

Li Qiang posted 1 patch 7 years ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1539828637-2907-1-git-send-email-liq3ea@gmail.com

Test docker-clang@ubuntu passed

Test checkpatch passed

Test asan passed

Test docker-mingw@fedora failed

Test docker-quick@centos7 passed

qga/commands-win32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] qga: fix an off-by-one issue

Posted by Li Qiang 7 years ago

Signed-off-by: Li Qiang <liq3ea@gmail.com>
---
 qga/commands-win32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 98d9735..e3842d1 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -465,7 +465,7 @@ static STORAGE_BUS_TYPE win2qemu[] = {
 
 static GuestDiskBusType find_bus_type(STORAGE_BUS_TYPE bus)
 {
-    if (bus > ARRAY_SIZE(win2qemu) || (int)bus < 0) {
+    if (bus >= ARRAY_SIZE(win2qemu) || (int)bus < 0) {
         return GUEST_DISK_BUS_TYPE_UNKNOWN;
     }
     return win2qemu[(int)bus];
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] qga: fix an off-by-one issue

Posted by Philippe Mathieu-Daudé 7 years ago

Missed in a3ef3b2272d.

On 18/10/2018 04:10, Li Qiang wrote:
> Signed-off-by: Li Qiang <liq3ea@gmail.com>

Nice catch btw.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  qga/commands-win32.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 98d9735..e3842d1 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -465,7 +465,7 @@ static STORAGE_BUS_TYPE win2qemu[] = {
>  
>  static GuestDiskBusType find_bus_type(STORAGE_BUS_TYPE bus)
>  {
> -    if (bus > ARRAY_SIZE(win2qemu) || (int)bus < 0) {
> +    if (bus >= ARRAY_SIZE(win2qemu) || (int)bus < 0) {
>          return GUEST_DISK_BUS_TYPE_UNKNOWN;
>      }
>      return win2qemu[(int)bus];
>

Re: [Qemu-devel] [PATCH] qga: fix an off-by-one issue

Posted by Michael Roth 7 years ago

Quoting Li Qiang (2018-10-17 21:10:37)
> Signed-off-by: Li Qiang <liq3ea@gmail.com>

Thanks, applied to qga tree:
  https://github.com/mdroth/qemu/commits/qga

> ---
>  qga/commands-win32.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 98d9735..e3842d1 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -465,7 +465,7 @@ static STORAGE_BUS_TYPE win2qemu[] = {
> 
>  static GuestDiskBusType find_bus_type(STORAGE_BUS_TYPE bus)
>  {
> -    if (bus > ARRAY_SIZE(win2qemu) || (int)bus < 0) {
> +    if (bus >= ARRAY_SIZE(win2qemu) || (int)bus < 0) {
>          return GUEST_DISK_BUS_TYPE_UNKNOWN;
>      }
>      return win2qemu[(int)bus];
> -- 
> 1.8.3.1
>