qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PULL 05/47] block/nfs: fix url parameter checking
Date: Fri, 27 Jun 2014 21:08:24 +0200	[thread overview]
Message-ID: <1403896146-3063-6-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1403896146-3063-1-git-send-email-kwolf@redhat.com>

From: Peter Lieven <pl@kamp.de>

this patch fixes the incorrect usage of strncmp and
adds simple error checking by means of parse_uint_full
instead of atoi for the supplied URL parameters.

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/nfs.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/block/nfs.c b/block/nfs.c
index ec43201..0b44483 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -304,17 +304,23 @@ static int64_t nfs_client_open(NFSClient *client, const char *filename,
 
     qp = query_params_parse(uri->query);
     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 fail;
         }
-        if (!strncmp(qp->p[i].name, "uid", 3)) {
-            nfs_set_uid(client->context, atoi(qp->p[i].value));
-        } else if (!strncmp(qp->p[i].name, "gid", 3)) {
-            nfs_set_gid(client->context, atoi(qp->p[i].value));
-        } else if (!strncmp(qp->p[i].name, "tcp-syncnt", 10)) {
-            nfs_set_tcp_syncnt(client->context, atoi(qp->p[i].value));
+        if (parse_uint_full(qp->p[i].value, &val, 0)) {
+            error_setg(errp, "Illegal value for NFS parameter: %s",
+                       qp->p[i].name);
+            goto fail;
+        }
+        if (!strcmp(qp->p[i].name, "uid")) {
+            nfs_set_uid(client->context, val);
+        } else if (!strcmp(qp->p[i].name, "gid")) {
+            nfs_set_gid(client->context, val);
+        } else if (!strcmp(qp->p[i].name, "tcp-syncnt")) {
+            nfs_set_tcp_syncnt(client->context, val);
         } else {
             error_setg(errp, "Unknown NFS parameter name: %s",
                        qp->p[i].name);
-- 
1.8.3.1

  parent reply	other threads:[~2014-06-27 19:09 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-27 19:08 [Qemu-devel] [PULL 00/47] Block patches for 2.1.0-rc0 Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 01/47] blockjob: Add block_job_yield() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 02/47] mirror: Go through ready -> complete process for 0 len image Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 03/47] qemu-iotests: Test BLOCK_JOB_READY event for 0Kb image active commit Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 04/47] qemu-iotests: Test 0-length image for mirror Kevin Wolf
2014-06-27 19:08 ` Kevin Wolf [this message]
2014-06-27 19:08 ` [Qemu-devel] [PULL 06/47] block/nfs: add knob to set readahead Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 07/47] block: Create bdrv_fill_options() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 08/47] block: Move bdrv_fill_options() call to bdrv_open() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 09/47] block: Move json: parsing to bdrv_fill_options() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 10/47] block: Always pass driver name through options QDict Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 11/47] block: Use common driver selection code for bdrv_open_file() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 12/47] block: Inline bdrv_file_open() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 13/47] block: Remove second bdrv_open() recursion Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 14/47] block: Catch backing files assigned to non-COW drivers Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 15/47] block: Remove a special case for protocols Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 16/47] qemu_opts_append: Play nicely with QemuOptsList's head Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 17/47] block: check for RESIZE blocker in the QMP command, not bdrv_truncate() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 18/47] block: add qemu-iotest for resize base during live commit Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 19/47] quorum: Add the rewrite-corrupted parameter to quorum Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 20/47] block: Add node-name argument to drive-mirror Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 21/47] virtio-blk: Move VirtIOBlockReq to header Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 22/47] virtio-blk: Convert VirtIOBlockReq.elem to pointer Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 23/47] virtio-blk: Drop bounce buffer from dataplane code Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 24/47] virtio-blk: Drop VirtIOBlockRequest.read Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 25/47] virtio-blk: Replace VirtIOBlockRequest with VirtIOBlockReq Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 26/47] virtio-blk: Use VirtIOBlockReq.in to drop VirtIOBlockReq.inhdr Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 27/47] virtio-blk: Convert VirtIOBlockReq.out to structrue Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 28/47] virtio-blk: Fill in VirtIOBlockReq.out in dataplane code Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 29/47] virtio-blk: Fix and clean up the in_sg and out_sg check Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 30/47] block: make bdrv_query_stats() static Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 31/47] block: acquire AioContext in qmp_query_blockstats() Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 32/47] virtio-blk: Make request completion function virtual Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 33/47] virtio-blk: Export request handling functions to dataplane Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 34/47] virtio-blk: Schedule BH in the right context Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 35/47] virtio-blk: Unify {non-, }dataplane's request handlings Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 36/47] virtio-blk: Rename complete_request_early to complete_request_vring Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 37/47] blockjob: Fix recent BLOCK_JOB_READY regression Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 38/47] blockjob: Fix recent BLOCK_JOB_ERROR regression Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 39/47] block: Add replaces argument to drive-mirror Kevin Wolf
2014-06-27 19:08 ` [Qemu-devel] [PULL 40/47] qemu-iotests: Add TestRepairQuorum to 041 to test drive-mirror node-name mode Kevin Wolf
2014-06-27 19:09 ` [Qemu-devel] [PULL 41/47] block.c: Don't return success for bdrv_append_temp_snapshot() failure Kevin Wolf
2014-06-27 19:09 ` [Qemu-devel] [PULL 42/47] iotests: Allow out-of-tree run Kevin Wolf
2014-06-27 19:09 ` [Qemu-devel] [PULL 43/47] configure: Enable out-of-tree iotests Kevin Wolf
2014-06-27 19:09 ` [Qemu-devel] [PULL 44/47] iotests: Source common.env Kevin Wolf
2014-06-27 19:09 ` [Qemu-devel] [PULL 45/47] iotests: Use $PYTHON for Python scripts Kevin Wolf
2014-06-27 19:09 ` [Qemu-devel] [PULL 46/47] iotests: Drop Python version from 065's Shebang Kevin Wolf
2014-06-27 19:09 ` [Qemu-devel] [PULL 47/47] iotests: Fix 083 for out-of-tree builds Kevin Wolf
2014-06-29 15:15 ` [Qemu-devel] [PULL 00/47] Block patches for 2.1.0-rc0 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403896146-3063-6-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).