block/nfs: fix segfault and naming of runtime opts
cover block/nfs: 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.
Peter Lieven (2):
block/nfs: fix NULL pointer dereference in URI parsing block/nfs: fix naming of runtime opts
block/nfs.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/2 block/nfs: fix NULL pointer dereference in URI parsing
parse_uint_full wants to put the parsed value into the variabled 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
Re: [Qemu-devel] [PATCH 1/2] block/nfs: fix NULL pointer dereference in URI parsing
Quoted 2 lines · Peter Lieven
parse_uint_fullwants to put the parsed value into the variabled passed via its second argument which is NULL.
s/variabled/variable/
Quoted 14 lines
Fixes 94d6a7a76e9df9919629428f6c598e2b97d9426cSigned-off-by Peter Lieven <[email protected]>--- block/nfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)block/nfs.c +0
-0@@ -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));
block/nfs.c static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) · line 117
Quoted 10 lines
block/nfs.c +2
-1for (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 )) {
block/nfs.c static int nfs_parse_uri(const char *filename, QDict *options, Error **errp) · line 118
Quoted 1 line
block/nfs.c +0
-0error_setg(errp, "Illegal value for NFS parameter: %s",
Not your fault, but I'm always wary of "Illegal" in an error message - the user isn't breaking any laws :) Better is "Invalid", but such a cleanup can be a separate tree-wide patch for qemu-trivial, if someone wants it.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
PATCH 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.
--- block/nfs.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
block/nfs.c +15 -15
@@ -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 );
Signature · 1 line
1.9.1
Re: [Qemu-devel] [PATCH 2/2] block/nfs: fix naming of runtime opts
Quoted 4 lines · Peter Lieven
commit 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.
The commit message should explicitly mention that this is technically backwards incompatible with the 2.8 release, but that the 2.8 release is the only version that had the wrong naming and that release also had the (just-fixed) bug of a crash during URI parsing.
Quoted 7 lines
Fixes 94d6a7a76e9df9919629428f6c598e2b97d9426cSigned-off-by Peter Lieven <[email protected]>--- block/nfs.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org