From patchwork Thu Jul 7 08:01:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9218139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7218E6048B for ; Thu, 7 Jul 2016 08:03:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6856E287A7 for ; Thu, 7 Jul 2016 08:03:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D6B0287AA; Thu, 7 Jul 2016 08:03:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F2658287A7 for ; Thu, 7 Jul 2016 08:03:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bL4Fu-0002uy-Eg; Thu, 07 Jul 2016 08:01:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bL4Ft-0002uo-Rr for xen-devel@lists.xenproject.org; Thu, 07 Jul 2016 08:01:53 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id C0/F0-26908-17C0E775; Thu, 07 Jul 2016 08:01:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRWlGSWpSXmKPExsXS6fjDS7eApy7 cYNovI4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNePur9VMBZfYKta8OcvYwHiUtYuRk0NIIE9i 75UfTCA2r4CdxPru3ewgtoSAocS++avYQGwWAVWJU1//MYPYbALqEm3PtoP1igDFFzQ8YAGxm QUcJbZ/2ghmCwv4SWzdsANoDgfQTEGJvzuEIUq0JB7+ugVVri2xbOFrZpASZgFpieX/OCYw8s xCaJiFpGEWkoZZCA0LGFlWMWoUpxaVpRbpGhroJRVlpmeU5CZm5gB5pnq5qcXFiempOYlJxXr J+bmbGIHBxAAEOxjXTHU+xCjJwaQkyrvnbm24EF9SfkplRmJxRnxRaU5q8SFGGQ4OJQnev1x1 4UKCRanpqRVpmTnAsIZJS3DwKInwfgNJ8xYXJOYWZ6ZDpE4x6nIs+HF7LZMQS15+XqqUOC8XN 1CRAEhRRmke3AhYjF1ilJUS5mUEOkqIpyC1KDezBFX+FaM4B6OSMO9PkFU8mXklcJteAR3BBH TET5dqkCNKEhFSUg2MUxU28W3qveo7If5Q/aNrZ2dFSR6V6z/DsmXJze65UsL5Vyrkn/+08b/ 76OWa11v285zg+62/+PK71H01rjw80xs+iv2/9kJS6Lsdu+3Drae2m/GZcCYscChZxlhk9VfW cc8az1tPtsZbbpvT5/9fR+Dhr78zzkxhL1NS1ma+G/cxcNr/NFWe9UosxRmJhlrMRcWJAA1zE yOsAgAA X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1467878511!36842573!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27643 invoked from network); 7 Jul 2016 08:01:52 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-15.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jul 2016 08:01:52 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 07 Jul 2016 02:01:50 -0600 Message-Id: <577E288D02000078000FBF10@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Thu, 07 Jul 2016 02:01:49 -0600 From: "Jan Beulich" To: "Juergen Gross" Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xenproject.org, linux-scsi@vger.kernel.org Subject: [Xen-devel] [PATCH] xen-scsifront: correct return value checks on xenbus_scanf() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Only a positive return value indicates success. Signed-off-by: Jan Beulich --- drivers/scsi/xen-scsifront.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 4.7-rc6-xenbus_scanf.orig/drivers/scsi/xen-scsifront.c +++ 4.7-rc6-xenbus_scanf/drivers/scsi/xen-scsifront.c @@ -1000,14 +1000,14 @@ static void scsifront_do_lun_hotplug(str snprintf(str, sizeof(str), "vscsi-devs/%s/state", dir[i]); err = xenbus_scanf(XBT_NIL, dev->otherend, str, "%u", &device_state); - if (XENBUS_EXIST_ERR(err)) + if (err <= 0) continue; /* virtual SCSI device */ snprintf(str, sizeof(str), "vscsi-devs/%s/v-dev", dir[i]); err = xenbus_scanf(XBT_NIL, dev->otherend, str, "%u:%u:%u:%u", &hst, &chn, &tgt, &lun); - if (XENBUS_EXIST_ERR(err)) + if (err != 4) continue; /*