fix segfault and naming of runtime opts
v3 cover fix segfault and naming of runtime opts
commit 94d6a7a accidently left the naming of runtime opts and QAPI scheme inconsistent. Furthermore a NULL pointer dereference resulted in a segfault when parsing URI parameters.
v1->v2: Patch 1: fixed type in commit msg [Eric]
Patch 2: noted backwards incompatiblity with 2.8 [Eric]v2->v3: Patch 2: also change names in nfs_refresh_filename [Max]
fix typo in commit msg [Eric]
Peter Lieven (2):
block/nfs: fix NULL pointer dereference in URI parsing block/nfs: fix naming of runtime opts
block/nfs.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-)
Signature · 1 line
1.9.1
PATCH v3 1/2 block/nfs: fix NULL pointer dereference in URI parsing
parse_uint_full wants to put the parsed value into the variable passed via its second argument which is NULL.
--- block/nfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
block/nfs.c +2 -1
@@ -108,12 +108,13 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp)qdict_put (options,"path" ,qstring_from_str (uri->path));for (i =0 ; i < qp->n; i++) { +unsigned long long val;if (!qp->p[i].value) {error_setg (errp,"Value for NFS parameter expected: %s" , qp->p[i].name); goto out; } -if (parse_uint_full (qp->p[i].value,NULL ,0 )) { +if (parse_uint_full (qp->p[i].value, &val,0 )) {error_setg (errp,"Illegal value for NFS parameter: %s" , qp->p[i].name); goto out;
Signature · 1 line
1.9.1
PATCH v3 2/2 block/nfs: fix naming of runtime opts
In reply to Peter Lievencommit 94d6a7a accidently left the naming of runtime opts and QAPI scheme inconsistent. As one consequence passing of parameters in the URI is broken. Sync the naming of the runtime opts to the QAPI scheme.
Please note that this is technically backwards incompatible with the 2.8 release, but the 2.8 release is the only version that had the wrong naming. Furthermore release 2.8 suffered from a NULL pointer dereference during URI parsing.
--- block/nfs.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
block/nfs.c +23 -23
@@ -359,27 +359,27 @@ static QemuOptsList runtime_opts = { .help = "Path of the image on the host", }, { - .name = "uid", + .name = "user", .type = QEMU_OPT_NUMBER, .help = "UID value to use when talking to the server", }, { - .name = "gid", + .name = "group", .type = QEMU_OPT_NUMBER, .help = "GID value to use when talking to the server", }, { - .name = "tcp-syncnt", + .name = "tcp-syn-count", .type = QEMU_OPT_NUMBER, .help = "Number of SYNs to send during the session establish", }, { - .name = "readahead", + .name = "readahead-size", .type = QEMU_OPT_NUMBER, .help = "Set the readahead size in bytes", }, { - .name = "pagecache", + .name = "page-cache-size", .type = QEMU_OPT_NUMBER, .help = "Set the pagecache size in bytes", },
@@ -508,29 +508,29 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, goto fail; } -if (qemu_opt_get (opts,"uid" )) { - client->uid =qemu_opt_get_number (opts,"uid" ,0 ); +if (qemu_opt_get (opts,"user" )) { + client->uid =qemu_opt_get_number (opts,"user" ,0 );nfs_set_uid (client->context, client->uid); } -if (qemu_opt_get (opts,"gid" )) { - client->gid =qemu_opt_get_number (opts,"gid" ,0 ); +if (qemu_opt_get (opts,"group" )) { + client->gid =qemu_opt_get_number (opts,"group" ,0 );nfs_set_gid (client->context, client->gid); } -if (qemu_opt_get (opts,"tcp-syncnt" )) { - client->tcp_syncnt =qemu_opt_get_number (opts,"tcp-syncnt" ,0 ); +if (qemu_opt_get (opts,"tcp-syn-count" )) { + client->tcp_syncnt =qemu_opt_get_number (opts,"tcp-syn-count" ,0 );nfs_set_tcp_syncnt (client->context, client->tcp_syncnt); }#ifdef LIBNFS_FEATURE_READAHEAD -if (qemu_opt_get (opts,"readahead" )) { +if (qemu_opt_get (opts,"readahead-size" )) {if (open_flags &BDRV_O_NOCACHE ) {error_setg (errp,"Cannot enable NFS readahead " "if cache.direct = on" ); goto fail; } - client->readahead =qemu_opt_get_number (opts,"readahead" ,0 ); + client->readahead =qemu_opt_get_number (opts,"readahead-size" ,0 );if (client->readahead >QEMU_NFS_MAX_READAHEAD_SIZE ) {error_report ("NFS Warning: Truncating NFS readahead " "size to %d" ,QEMU_NFS_MAX_READAHEAD_SIZE );
@@ -545,13 +545,13 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options,#endif #ifdef LIBNFS_FEATURE_PAGECACHE -if (qemu_opt_get (opts,"pagecache" )) { +if (qemu_opt_get (opts,"page-cache-size" )) {if (open_flags &BDRV_O_NOCACHE ) {error_setg (errp,"Cannot enable NFS pagecache " "if cache.direct = on" ); goto fail; } - client->pagecache =qemu_opt_get_number (opts,"pagecache" ,0 ); + client->pagecache =qemu_opt_get_number (opts,"page-cache-size" ,0 );if (client->pagecache >QEMU_NFS_MAX_PAGECACHE_SIZE ) {error_report ("NFS Warning: Truncating NFS pagecache " "size to %d pages" ,QEMU_NFS_MAX_PAGECACHE_SIZE );
@@ -804,22 +804,22 @@ static void nfs_refresh_filename(BlockDriverState *bs, QDict *options)qdict_put (opts,"path" ,qstring_from_str (client->path));if (client->uid) { -qdict_put (opts,"uid" ,qint_from_int (client->uid)); +qdict_put (opts,"user" ,qint_from_int (client->uid)); }if (client->gid) { -qdict_put (opts,"gid" ,qint_from_int (client->gid)); +qdict_put (opts,"group" ,qint_from_int (client->gid)); }if (client->tcp_syncnt) { -qdict_put (opts,"tcp-syncnt" , -qint_from_int (client->tcp_syncnt)); +qdict_put (opts,"tcp-syn-cnt" , +qint_from_int (client->tcp_syncnt)); }if (client->readahead) { -qdict_put (opts,"readahead" , -qint_from_int (client->readahead)); +qdict_put (opts,"readahead-size" , +qint_from_int (client->readahead)); }if (client->pagecache) { -qdict_put (opts,"pagecache" , -qint_from_int (client->pagecache)); +qdict_put (opts,"page-cache-size" , +qint_from_int (client->pagecache)); }if (client->debug) {qdict_put (opts,"debug" ,qint_from_int (client->debug));
Signature · 1 line
1.9.1
Re: [Qemu-devel] [PATCH V3 2/2] block/nfs: fix naming of runtime opts
Quoted 1 line · Peter Lieven
commit 94d6a7a accidently left the naming of runtime opts and QAPI
Whoops - I caught one typo in v2, but missed another:
s/accidently/accidentally/
Quoted 9 lines
scheme inconsistent. As one consequence passing of parameters in the URI is broken. Sync the naming of the runtime opts to the QAPI scheme.
Please note that this is technically backwards incompatible with the 2.8 release, but the 2.8 release is the only version that had the wrong naming. Furthermore release 2.8 suffered from a NULL pointer dereference during URI parsing.
Quoted 6 lines
Fixes 94d6a7a76e9df9919629428f6c598e2b97d9426cSigned-off-by Peter Lieven <[email protected]>--- block/nfs.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
(Maintainer can probably fix the typo)
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Max Reitz
AppliedQuoted 9 lines · Peter Lieven
commit 94d6a7a accidently left the naming of runtime opts and QAPI scheme inconsistent. Furthermore a NULL pointer dereference resulted in a segfault when parsing URI parameters.
v1->v2: Patch 1: fixed type in commit msg [Eric]
Patch 2: noted backwards incompatiblity with 2.8 [Eric]v2->v3: Patch 2: also change names innfs_refresh_filename[Max]
fix typo in commit msg [Eric]
Quoted 6 lines
Peter Lieven (2):
block/nfs: fix NULL pointer dereference in URI parsing block/nfs: fix naming of runtime optsblock/nfs.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-)
Thanks, applied to my block tree (with the spelling fix proposed by Eric):
https://github.com/XanClic/qemu/commits/block
Max