[PULL 0/1] 9p fixes for 5.1 2020-07-10

[PULL 0/1] 9p fixes for 5.1 2020-07-10

[Greg Kurz]

The following changes since commit b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf:

  Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2020-07-10 09:01:28 +0100)

are available in the Git repository at:

  https://github.com/gkurz/qemu.git tags/9p-fix-2020-07-10

for you to fetch changes up to 353b5a91ccf2789b85967d19a8795816b8865562:

  9p: null terminate fs driver options list (2020-07-10 12:48:06 +0200)

----------------------------------------------------------------
Add missing NULL terminating element in fsdev option lists. Never
crashed QEMU by pure luck.

----------------------------------------------------------------
Prasad J Pandit (1):
      9p: null terminate fs driver options list

 fsdev/qemu-fsdev.c | 3 +++
 1 file changed, 3 insertions(+)
-- 
2.26.2

[PULL 1/1] 9p: null terminate fs driver options list

[Greg Kurz]

From: Prasad J Pandit <pjp@fedoraproject.org>

NULL terminate fs driver options' list, validate_opt() looks for
a null entry to terminate the loop.

Fixes: aee7f3ecd8b7 ("fsdev: Error out when unsupported option is passed")
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200709175848.650400-1-ppandit@redhat.com>
Signed-off-by: Greg Kurz <groug@kaod.org>
---
 fsdev/qemu-fsdev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c
index a9e069c0c78d..3da64e9f72b4 100644
--- a/fsdev/qemu-fsdev.c
+++ b/fsdev/qemu-fsdev.c
@@ -78,6 +78,7 @@ static FsDriverTable FsDrivers[] = {
             "throttling.iops-read-max-length",
             "throttling.iops-write-max-length",
             "throttling.iops-size",
+            NULL
         },
     },
     {
@@ -85,6 +86,7 @@ static FsDriverTable FsDrivers[] = {
         .ops = &synth_ops,
         .opts = (const char * []) {
             COMMON_FS_DRIVER_OPTIONS,
+            NULL
         },
     },
     {
@@ -95,6 +97,7 @@ static FsDriverTable FsDrivers[] = {
             "socket",
             "sock_fd",
             "writeout",
+            NULL
         },
     },
 };
-- 
2.26.2

Re: [PULL 0/1] 9p fixes for 5.1 2020-07-10

[Peter Maydell]

On Fri, 10 Jul 2020 at 17:35, Greg Kurz <groug@kaod.org> wrote:
>
> The following changes since commit b6d7e9b66f59ca6ebc6e9b830cd5e7bf849d31cf:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2020-07-10 09:01:28 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/gkurz/qemu.git tags/9p-fix-2020-07-10
>
> for you to fetch changes up to 353b5a91ccf2789b85967d19a8795816b8865562:
>
>   9p: null terminate fs driver options list (2020-07-10 12:48:06 +0200)
>
> ----------------------------------------------------------------
> Add missing NULL terminating element in fsdev option lists. Never
> crashed QEMU by pure luck.
>
> ----------------------------------------------------------------
> Prasad J Pandit (1):
>       9p: null terminate fs driver options list
>
>  fsdev/qemu-fsdev.c | 3 +++
>  1 file changed, 3 insertions(+)
> --


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM