From patchwork Thu Jul 7 07:42:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9217987 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 A7DDB607D9 for ; Thu, 7 Jul 2016 07:44:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9DD982877E for ; Thu, 7 Jul 2016 07:44:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9184828781; Thu, 7 Jul 2016 07:44:37 +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 2D98E28783 for ; Thu, 7 Jul 2016 07:44:37 +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 1bL3x9-00087g-1M; Thu, 07 Jul 2016 07:42:31 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bL3x7-00087X-NF for xen-devel@lists.xenproject.org; Thu, 07 Jul 2016 07:42:29 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 4A/44-11548-5E70E775; Thu, 07 Jul 2016 07:42:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRWlGSWpSXmKPExsXS6fjDS/cJe12 4Qdd9TYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePWnodMBYfZKk4sOcDWwHibtYuRk0NIIE+i e1onM4jNK2AnsWzKP7C4hIChxL75q9i6GDk4WARUJWadUwMJswmoS7Q92w5WIiIQJ3Hoylt2E JtZwFli47J2FpByYQFbiVVrBEFMXgFBib87hCEqtCQe/rrFAmFrSyxb+JoZpIRZQFpi+T+OCY w8sxAaZiFpmIWkYRZCwwJGllWM6sWpRWWpRbrGeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUn Fesn5uZsYgWHEAAQ7GDv+OR1ilORgUhLl3XO3NlyILyk/pTIjsTgjvqg0J7X4EKMGB4fAtl2r LzBKseTl56UqSfBeYKsLFxIsSk1PrUjLzAEGOkypBAePkgjvPpA0b3FBYm5xZjpE6hSjLseCH 7fXMgmBzZAS590IUiQAUpRRmgc3AhZ1lxhlpYR5GYEOFOIpSC3KzSxBlX/FKM7BqCTMuxdkCk 9mXgncpldARzABHfHTpRrkiJJEhJRUA6ObmHb8DG7FDyblj4pTZZ0kFj+/c3Jm9Zmjz18+lPs 5/0ZeU/ZzkwvTLt84FXA8xbk3SPvzpTolcdZjQZxKX/MywnfUlh6q8p24b4O2p0Wxx82G+7fl Xn3TsJvPc/GyxcSjD/YpVZoIXpkwT0NgRWnQwv7GPZ9FxTryl95gSktMOHPq/Oo7DrFKLMUZi YZazEXFiQAr+3rRtQIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1467877347!22591861!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 15354 invoked from network); 7 Jul 2016 07:42:28 -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 07:42:28 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 07 Jul 2016 01:42:26 -0600 Message-Id: <577E240002000078000FBE41@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Thu, 07 Jul 2016 01:42:24 -0600 From: "Jan Beulich" To: ,, "Juergen Gross" Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH] xenbus: check return value of 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 Set backend state to unknown when unsuccessful. Signed-off-by: Jan Beulich --- drivers/xen/xenbus/xenbus_probe_frontend.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- 4.7-rc6-xenbus_scanf.orig/drivers/xen/xenbus/xenbus_probe_frontend.c +++ 4.7-rc6-xenbus_scanf/drivers/xen/xenbus/xenbus_probe_frontend.c @@ -342,7 +342,9 @@ static int backend_state; static void xenbus_reset_backend_state_changed(struct xenbus_watch *w, const char **v, unsigned int l) { - xenbus_scanf(XBT_NIL, v[XS_WATCH_PATH], "", "%i", &backend_state); + if (xenbus_scanf(XBT_NIL, v[XS_WATCH_PATH], "", "%i", + &backend_state) != 1) + backend_state = XenbusStateUnknown; printk(KERN_DEBUG "XENBUS: backend %s %s\n", v[XS_WATCH_PATH], xenbus_strstate(backend_state)); wake_up(&backend_state_wq);