From owner-svn-src-stable@freebsd.org  Mon Nov 23 09:33:29 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E617A350D6;
 Mon, 23 Nov 2015 09:33:29 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CCCF61843;
 Mon, 23 Nov 2015 09:33:28 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAN9XRPC006002;
 Mon, 23 Nov 2015 09:33:27 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAN9XR1Y006001;
 Mon, 23 Nov 2015 09:33:27 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201511230933.tAN9XR1Y006001@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 23 Nov 2015 09:33:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r291185 - stable/10/sys/ofed/drivers/net/mlx4
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2015 09:33:29 -0000

Author: ngie
Date: Mon Nov 23 09:33:27 2015
New Revision: 291185
URL: https://svnweb.freebsd.org/changeset/base/291185

Log:
  MFC r291047:
  
  Don't leak work if __mlx4_register_vlan(..) fails in
  mlx4_master_immediate_activate_vlan_qos(..)
  
  Differential Revision: https://reviews.freebsd.org/D4203
  Submitted by: Miles Olrich <miles.olrich@isilon.com>
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/sys/ofed/drivers/net/mlx4/cmd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ofed/drivers/net/mlx4/cmd.c
==============================================================================
--- stable/10/sys/ofed/drivers/net/mlx4/cmd.c	Mon Nov 23 09:32:32 2015	(r291184)
+++ stable/10/sys/ofed/drivers/net/mlx4/cmd.c	Mon Nov 23 09:33:27 2015	(r291185)
@@ -1784,6 +1784,7 @@ static int mlx4_master_immediate_activat
 				mlx4_warn((&priv->dev),
 					  "No vlan resources slave %d, port %d\n",
 					  slave, port);
+				kfree(work);
 				return err;
 			}
 		} else {