From patchwork Thu Jul 7 08:01:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9218127 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 9A31C6048B for ; Thu, 7 Jul 2016 08:03:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FB322879D for ; Thu, 7 Jul 2016 08:03:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8477E2879F; Thu, 7 Jul 2016 08:03:23 +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 375FF2879D for ; Thu, 7 Jul 2016 08:03:23 +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 1bL4FJ-0002nW-6A; Thu, 07 Jul 2016 08:01:17 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bL4FH-0002nD-Ur for xen-devel@lists.xenproject.org; Thu, 07 Jul 2016 08:01:16 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 98/59-09256-B4C0E775; Thu, 07 Jul 2016 08:01:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOIsWRWlGSWpSXmKPExsXS6fjDS9eLpy7 cYPo5G4vvWyYzOTB6HP5whSWAMYo1My8pvyKBNWNtxz/2gmfsFT8OHWJvYLzA1sXIySEkkCfR dO8xK4jNK2An8ej9cmYQW0LAUGLf/FVANRwcLAKqEhdvOoCE2QTUJdqebQcrFwEKL2h4wAJiM ws4Smz/tBHMFhbwlXizfSFYK6+AoMTfHcIQJVoSD3/dgirXlli28DUzSAmzgLTE8n8cExh5Zi E0zELSMAtJwyyEhgWMLKsY1YtTi8pSi3SN9ZKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZL zczcxAgOJAQh2MHb8czrEKMnBpCTKu+dubbgQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd4S7rpw IcGi1PTUirTMHGBIw6QlOHiURHjXgKR5iwsSc4sz0yFSpxh1ORb8uL2WSYglLz8vVUqctxWkS ACkKKM0D24ELL4uMcpKCfMyAh0lxFOQWpSbWYIq/4pRnINRSZi3FGQKT2ZeCdymV0BHMAEd8d OlGuSIkkSElFQDY+2DrXVJ/+vO2gZMKa1mVcm59j1qce/H3cLyOp9lVt7ht7yRkxartf5dyv2 r2z7cy0rwvR6g8cH62fsX2wTeze4pW777gLulwpl/vG73tn92Nb8qytnGl/pXouTq+c3XYxTW zPlmYdv8+fDiL5mlRbM3MCoKZ8w5yf9O8k4T/9/pkut3y73OVlRiKc5INNRiLipOBACuXld+q gIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1467878473!22595553!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.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57466 invoked from network); 7 Jul 2016 08:01:14 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-10.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jul 2016 08:01:14 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 07 Jul 2016 02:01:12 -0600 Message-Id: <577E286802000078000FBECF@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Thu, 07 Jul 2016 02:01:12 -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-scsiback: 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/xen/xen-scsiback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 4.7-rc6-xenbus_scanf.orig/drivers/xen/xen-scsiback.c +++ 4.7-rc6-xenbus_scanf/drivers/xen/xen-scsiback.c @@ -1071,7 +1071,7 @@ static void scsiback_do_1lun_hotplug(str /* read status */ snprintf(state, sizeof(state), "vscsi-devs/%s/state", ent); err = xenbus_scanf(XBT_NIL, dev->nodename, state, "%u", &device_state); - if (XENBUS_EXIST_ERR(err)) + if (err <= 0) return; /* physical SCSI device */ @@ -1089,7 +1089,7 @@ static void scsiback_do_1lun_hotplug(str snprintf(str, sizeof(str), "vscsi-devs/%s/v-dev", ent); err = xenbus_scanf(XBT_NIL, dev->nodename, str, "%u:%u:%u:%u", &vir.hst, &vir.chn, &vir.tgt, &vir.lun); - if (XENBUS_EXIST_ERR(err)) { + if (err != 4) { xenbus_printf(XBT_NIL, dev->nodename, state, "%d", XenbusStateClosed); return;