From owner-svn-src-head@freebsd.org  Thu Jul 30 18:28:38 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 3F58B9AB240;
 Thu, 30 Jul 2015 18:28:38 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 302A81410;
 Thu, 30 Jul 2015 18:28:38 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6UIScnV065586;
 Thu, 30 Jul 2015 18:28:38 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6UIScHg065585;
 Thu, 30 Jul 2015 18:28:38 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201507301828.t6UIScHg065585@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 30 Jul 2015 18:28:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286087 - head/sys/ofed/drivers/infiniband/core
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jul 2015 18:28:38 -0000

Author: markj
Date: Thu Jul 30 18:28:37 2015
New Revision: 286087
URL: https://svnweb.freebsd.org/changeset/base/286087

Log:
  ib mad: fix an incorrect use of list_for_each_entry
  
  In tf_dequeue(), if we reach the end of the list without finding a
  non-cancelled element, "tmp" will be a pointer into the list head, so the
  tmp->canceled check is bogus. Use a flag instead.
  
  Submitted by:	Tao Liu <Tao.Liu@isilon.com>
  Reviewed by:	hselasky
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division
  Differential Revision: https://reviews.freebsd.org/D3244

Modified:
  head/sys/ofed/drivers/infiniband/core/mad.c

Modified: head/sys/ofed/drivers/infiniband/core/mad.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/mad.c	Thu Jul 30 18:28:34 2015	(r286086)
+++ head/sys/ofed/drivers/infiniband/core/mad.c	Thu Jul 30 18:28:37 2015	(r286087)
@@ -292,6 +292,7 @@ static struct tf_entry *tf_dequeue(struc
 	unsigned long flags;
 	unsigned long time_left;
 	struct tf_entry *tmp, *tmp1;
+	bool found = false;
 
 	spin_lock_irqsave(&tf->lists_lock, flags);
 	if (list_empty(&tf->fifo_head)) {
@@ -300,11 +301,13 @@ static struct tf_entry *tf_dequeue(struc
 	}
 
 	list_for_each_entry(tmp, &tf->fifo_head, fifo_list) {
-		if (!tmp->canceled)
+		if (!tmp->canceled) {
+			found = true;
 			break;
+		}
 	}
 
-	if (tmp->canceled) {
+	if (!found) {
 		spin_unlock_irqrestore(&tf->lists_lock, flags);
 		return NULL;
 	}