[Qemu-devel] [PATCH] ide: avoid referencing NULL dev in rotational rate setting

Daniel P. Berrange posted 1 patch 8 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171020091403.1479-1-berrange@redhat.com
Test checkpatch passed
Test docker passed
Test s390x passed
hw/ide/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[Qemu-devel] [PATCH] ide: avoid referencing NULL dev in rotational rate setting
Posted by Daniel P. Berrange 8 years ago
The 'dev' variable can be NULL when the guest OS calls identify on an IDE
unit that does not have a drive attached to it.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 hw/ide/core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index a04766aee7..471d0c928b 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -208,7 +208,9 @@ static void ide_identify(IDEState *s)
     if (dev && dev->conf.discard_granularity) {
         put_le16(p + 169, 1); /* TRIM support */
     }
-    put_le16(p + 217, dev->rotation_rate); /* Nominal media rotation rate */
+    if (dev) {
+        put_le16(p + 217, dev->rotation_rate); /* Nominal media rotation rate */
+    }
 
     ide_identify_size(s);
     s->identify_set = 1;
-- 
2.13.6


Re: [Qemu-devel] [Qemu-block] [PATCH] ide: avoid referencing NULL dev in rotational rate setting
Posted by Stefan Hajnoczi 8 years ago
On Fri, Oct 20, 2017 at 10:14:03AM +0100, Daniel P. Berrange wrote:
> The 'dev' variable can be NULL when the guest OS calls identify on an IDE
> unit that does not have a drive attached to it.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  hw/ide/core.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [Qemu-devel] [PATCH] ide: avoid referencing NULL dev in rotational rate setting
Posted by Daniel P. Berrange 8 years ago
CC John

On Fri, Oct 20, 2017 at 10:14:03AM +0100, Daniel P. Berrange wrote:
> The 'dev' variable can be NULL when the guest OS calls identify on an IDE
> unit that does not have a drive attached to it.
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  hw/ide/core.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/ide/core.c b/hw/ide/core.c
> index a04766aee7..471d0c928b 100644
> --- a/hw/ide/core.c
> +++ b/hw/ide/core.c
> @@ -208,7 +208,9 @@ static void ide_identify(IDEState *s)
>      if (dev && dev->conf.discard_granularity) {
>          put_le16(p + 169, 1); /* TRIM support */
>      }
> -    put_le16(p + 217, dev->rotation_rate); /* Nominal media rotation rate */
> +    if (dev) {
> +        put_le16(p + 217, dev->rotation_rate); /* Nominal media rotation rate */
> +    }
>  
>      ide_identify_size(s);
>      s->identify_set = 1;
> -- 
> 2.13.6
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [Qemu-block] [PATCH] ide: avoid referencing NULL dev in rotational rate setting
Posted by Stefan Hajnoczi 8 years ago
On Tue, Oct 24, 2017 at 08:43:24AM +0100, Daniel P. Berrange wrote:
> CC John

Feel free to ping me if John doesn't respond by next Wednesday and I'll
merge this trivial fix.

Stefan