From patchwork Thu Jul 7 07:38:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9217961 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 A4D4D60467 for ; Thu, 7 Jul 2016 07:40:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 981652877E for ; Thu, 7 Jul 2016 07:40:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 891D728781; Thu, 7 Jul 2016 07:40: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 01B8C2877E for ; Thu, 7 Jul 2016 07:40: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 1bL3t2-0007GY-PQ; Thu, 07 Jul 2016 07:38:16 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bL3t2-0007GM-E5 for xen-devel@lists.xenproject.org; Thu, 07 Jul 2016 07:38:16 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id C2/DD-11548-7E60E775; Thu, 07 Jul 2016 07:38:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGIsWRWlGSWpSXmKPExsXS6fjDS/c5W12 4waWffBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bTZYuZCtawVixZd4q1gXEvSxcjJ4eQQJ7E yZ87mEFsXgE7iT+fl7KC2BIChhL75q9iA7FZBFQl5k57CFbPJqAu0fZsO1ANB4eIQLzE43dBI GFmAWeJjcvaWUDCwgK2Eud+MoGYvAKCEn93CENUaEk8/HWLBcLWlli28DUzSAmzgLTE8n8cEx h5ZiE0zELSMAtJwyyEhgWMLKsY1YtTi8pSi3QN9ZKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpO K9ZLzczcxAsOIAQh2MO587nSIUZKDSUmUd8/d2nAhvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErwP WevChQSLUtNTK9Iyc4ABDZOW4OBREuG9BpLmLS5IzC3OTIdInWLU5Vjw4/ZaJiGWvPy8VClx3 iUgRQIgRRmleXAjYNF1iVFWSpiXEegoIZ6C1KLczBJU+VeM4hyMSsK850Cm8GTmlcBtegV0BB PQET9dqkGOKElESEk1MDYIdHJN0PL97t93L7395yXTRw5VNvUNPAsa7llN+Gkv1B64vS3ic8t 7Eza9zMpr36efmKCxRn9y125u7lxtJgHm3YKdHsH/95/PXPwiYmIXZ/p0O3+PebsO7tJqEbql Uu774OTf9Vy6ZVteXkpbeeNK5DPXt6G6j2bLhb5ilMpQY0zlktL6qcRSnJFoqMVcVJwIAFSKK gCpAgAA X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1467877093!22767577!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 48110 invoked from network); 7 Jul 2016 07:38:15 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-13.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jul 2016 07:38:15 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Thu, 07 Jul 2016 01:38:13 -0600 Message-Id: <577E230502000078000FBE0D@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Thu, 07 Jul 2016 01:38:13 -0600 From: "Jan Beulich" To: "Roger Pau Monne" , "Konrad Rzeszutek Wilk" Mime-Version: 1.0 Content-Disposition: inline Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Subject: [Xen-devel] [PATCH] xen-blkback: really don't leak mode property 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 Commit 9d092603cc ("xen-blkback: do not leak mode property") left one path unfixed; correct this. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- drivers/block/xen-blkback/xenbus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- 4.7-rc6-xen.orig/drivers/block/xen-blkback/xenbus.c +++ 4.7-rc6-xen/drivers/block/xen-blkback/xenbus.c @@ -715,8 +715,11 @@ static void backend_changed(struct xenbu /* Front end dir is a number, which is used as the handle. */ err = kstrtoul(strrchr(dev->otherend, '/') + 1, 0, &handle); - if (err) + if (err) { + kfree(be->mode); + be->mode = NULL; return; + } be->major = major; be->minor = minor;