[PULL for-6.2 0/3] Ide patches

[PULL for-6.2 0/3] Ide patches

[John Snow]

The following changes since commit 682aa69b1f4dd5f2905a94066fa4c853adc33251:

  Update version for v6.2.0-rc3 release (2021-12-01 07:20:06 +0100)

are available in the Git repository at:

  https://gitlab.com/jsnow/qemu.git tags/ide-pull-request

for you to fetch changes up to cc20926e9b8077bff6813efc8dcdeae90d1a3b10:

  tests/qtest/fdc-test: Add a regression test for CVE-2021-20196 (2021-12-02 01:09:38 -0500)

----------------------------------------------------------------
Pull request

----------------------------------------------------------------

Philippe Mathieu-Daudé (3):
  hw/block/fdc: Extract blk_create_empty_drive()
  hw/block/fdc: Kludge missing floppy drive to fix CVE-2021-20196
  tests/qtest/fdc-test: Add a regression test for CVE-2021-20196

 hw/block/fdc.c         | 23 ++++++++++++++++++++---
 tests/qtest/fdc-test.c | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

-- 
2.31.1

[PULL for-6.2 1/3] hw/block/fdc: Extract blk_create_empty_drive()

[John Snow]

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

We are going to re-use this code in the next commit,
so extract it as a new blk_create_empty_drive() function.

Inspired-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20211124161536.631563-2-philmd@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
 hw/block/fdc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index fa933cd326..1dbf3f6028 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -61,6 +61,12 @@
     } while (0)
 
 
+/* Anonymous BlockBackend for empty drive */
+static BlockBackend *blk_create_empty_drive(void)
+{
+    return blk_new(qemu_get_aio_context(), 0, BLK_PERM_ALL);
+}
+
 /********************************************************/
 /* qdev floppy bus                                      */
 
@@ -486,8 +492,7 @@ static void floppy_drive_realize(DeviceState *qdev, Error **errp)
     }
 
     if (!dev->conf.blk) {
-        /* Anonymous BlockBackend for an empty drive */
-        dev->conf.blk = blk_new(qemu_get_aio_context(), 0, BLK_PERM_ALL);
+        dev->conf.blk = blk_create_empty_drive();
         ret = blk_attach_dev(dev->conf.blk, qdev);
         assert(ret == 0);
 
-- 
2.31.1

Re: [PULL for-6.2 0/3] Ide patches

[Richard Henderson]

On 12/1/21 10:17 PM, John Snow wrote:
> The following changes since commit 682aa69b1f4dd5f2905a94066fa4c853adc33251:
> 
>    Update version for v6.2.0-rc3 release (2021-12-01 07:20:06 +0100)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/jsnow/qemu.git tags/ide-pull-request
> 
> for you to fetch changes up to cc20926e9b8077bff6813efc8dcdeae90d1a3b10:
> 
>    tests/qtest/fdc-test: Add a regression test for CVE-2021-20196 (2021-12-02 01:09:38 -0500)
> 
> ----------------------------------------------------------------
> Pull request
> 
> ----------------------------------------------------------------
> 
> Philippe Mathieu-Daudé (3):
>    hw/block/fdc: Extract blk_create_empty_drive()
>    hw/block/fdc: Kludge missing floppy drive to fix CVE-2021-20196
>    tests/qtest/fdc-test: Add a regression test for CVE-2021-20196
> 
>   hw/block/fdc.c         | 23 ++++++++++++++++++++---
>   tests/qtest/fdc-test.c | 38 ++++++++++++++++++++++++++++++++++++++
>   2 files changed, 58 insertions(+), 3 deletions(-)

Applied, thanks.

r~