From patchwork Fri Mar 16 14:43:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nee X-Patchwork-Id: 886872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IKGvcUJ3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 402pBf6lLhz9sDX for ; Sat, 17 Mar 2018 01:44:26 +1100 (AEDT) Received: from localhost ([::1]:57517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewqam-0006Xx-R4 for incoming@patchwork.ozlabs.org; Fri, 16 Mar 2018 10:44:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewqZl-0005pR-Mc for qemu-devel@nongnu.org; Fri, 16 Mar 2018 10:43:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewqZk-0000MZ-Su for qemu-devel@nongnu.org; Fri, 16 Mar 2018 10:43:21 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:55145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewqZk-0000MC-M9; Fri, 16 Mar 2018 10:43:20 -0400 Received: by mail-wm0-x242.google.com with SMTP id h76so3487690wme.4; Fri, 16 Mar 2018 07:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ixvrnJZ3el6Nl6PexI16h7Nv+kH+wuhW3OT+ZvTvdCc=; b=IKGvcUJ31Az0HrfSfdekgP7SsKe8poRELbl8SgFTPwX1cr+KP0e4SZM0dhaHESJ5kN EwdUKgPr+eiduXAXiHQIpR9YocFhjZhN3tQtjqfneH/SgVFuJfqwS85t0x6TMqoULVOh xYh51Z0oTXg7/xsD7JB4x+WeaTRqoPepI489h9KeMDE4U5V0eSt50bAZQC5W9a/tcb+q Zf63HH7JikOsQBnNY5xvYxvLtRGW2juy+sv4Dy4vfDKRo+l08RwQSG39tdAfqRaQ5siR nLW6jBn400X1zVjzenAPRPklrRoTVPAMIlDr3TZKO8E31TZksKIdLTM9AMKzWfeFSak3 P3jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ixvrnJZ3el6Nl6PexI16h7Nv+kH+wuhW3OT+ZvTvdCc=; b=V0CfGJbCUSFOQ7CaTjB9HYSAaHlDWUZ1xrT6DQX6gUNUvDv/ZlGi9I8a2rUkAuQXLw 6/Wp7wD0QmdXey8zej+aSzG6xOcRV7g6DG5DD+TRD1tWrq6BY791S3VHCY0hjRHpuvpG O6ZOYsCgzG4+vohn+EYrLwAf92XwI/wHp6bh0FN4K1h03syP2j2NyybUWOwmWc6oBrvQ rcU3YC/RzuZaHPfjJ+8Vba4mcLMpPi9KV9UUN/oJq7Q64LIeGf9TIIlEO1MlJzRgeUQ/ D0PEtxvLRCAEhRrz+VWC/jComCealZURcgjc5Id+ICtIg6zetOHlsvO2A7oO9I/uhX5i bmKg== X-Gm-Message-State: AElRT7GuVyiilAU6fVZRTs6otI0HPR9i5rlcIVEu3Lx+z/9w9ScM250A /tiSeDA27zqDQId0nh1fdYBxlg== X-Google-Smtp-Source: AG47ELtSDzTDiMbhYDOOnBfGQBa1o5r8iNIjnSQsNnPtMn78NbDcuoEi+TuCUC5EPC8ksQaARy6SbQ== X-Received: by 10.80.175.99 with SMTP id g90mr2775415edd.9.1521211399381; Fri, 16 Mar 2018 07:43:19 -0700 (PDT) Received: from localhost.localdomain ([185.222.219.238]) by smtp.gmail.com with ESMTPSA id w56sm4121448eda.83.2018.03.16.07.43.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Mar 2018 07:43:18 -0700 (PDT) From: Nia Alarie To: qemu-devel@nongnu.org Date: Fri, 16 Mar 2018 14:43:07 +0000 Message-Id: <20180316144307.31073-1-nia.alarie@gmail.com> X-Mailer: git-send-email 2.16.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH] block/xen_disk: Convert atoi use to qemu_strtol to allow error checking X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@gmail.com, jim@groklearning.com, joel@jms.id.au, qemu-block@nongnu.org, Nia Alarie Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Nia Alarie --- hw/block/xen_disk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index f74fcd42d1..a9ec0ad6eb 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -32,6 +32,7 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" +#include "qemu/cutils.h" #include "trace.h" /* ------------------------------------------------------------- */ @@ -1010,7 +1011,10 @@ static int blk_init(struct XenDevice *xendev) blkdev->devtype = xenstore_read_be_str(&blkdev->xendev, "device-type"); } directiosafe = xenstore_read_be_str(&blkdev->xendev, "direct-io-safe"); - blkdev->directiosafe = (directiosafe && atoi(directiosafe)); + + if (directiosafe && qemu_strtoi(directiosafe, NULL, 10, &blkdev->directiosafe)) { + goto out_error; + } /* do we have all we need? */ if (blkdev->params == NULL ||