From gnats@FreeBSD.org  Thu Jan  3 16:28:46 2008
Return-Path: <gnats@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6505316A420
	for <freebsd-gnats-submit@hub.freebsd.org>; Thu,  3 Jan 2008 16:28:46 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 545BD13C46A
	for <freebsd-gnats-submit@hub.freebsd.org>; Thu,  3 Jan 2008 16:28:46 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m03GSkLA052316
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 3 Jan 2008 16:28:46 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m03GSkU2052315;
	Thu, 3 Jan 2008 16:28:46 GMT
	(envelope-from gnats)
Message-Id: <200801031628.m03GSkU2052315@freefall.freebsd.org>
Date: Thu, 3 Jan 2008 16:28:46 GMT
From: Doug Moore <dougm@ironport.com>
Reply-To: Doug Moore <dougm@ironport.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: TRASHIT macro blasts list header if REMOVE invoked with header ref
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         119307
>Category:       kern
>Synopsis:       [queue] [patch] TRASHIT macro blasts list header if REMOVE invoked with header ref
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    emaste
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 03 16:30:03 UTC 2008
>Closed-Date:    Sat Feb 27 04:03:06 UTC 2010
>Last-Modified:  Sat Feb 27 04:10:01 UTC 2010
>Originator:     Doug Moore <dougm@ironport.com>
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD adsl-216-63-78-19.dsl.hstntx.swbell.net 7.0-CURRENT FreeBSD 7.0-CURRENT #5: Sat Sep 15 00:42:55 CDT 2007 root@adsl-216-63-78-19.dsl.hstntx.swbell.net:/usr/src/sys/i386/compile/ATHEROS i386


	
>Description:
	A line like
	TAILQ_REMOVE(&a->tailq, a->tailq.tqh_first, next);
	will corrupt the tailq in question if QUEUE_MACRO_DEBUG is on,
	since after the first tailq item is removed, it is the *new*
	first tailq item that gets its prev and next pointers trashed.
	With QUEUE_MACRO_DEBUG off, it removes the first tailq as
	expected.  Therefore, turning on QUEUE_MACRO_DEBUG corrupts
	the tailq.
>How-To-Repeat:
	Write a self-referential invocation of a removal from tailq,
	list, etc, and add a couple of items to the list before
	invoking that removal.
>Fix:
	Use typeof to bind the value of the to-be-removed element to a
	name, and use that name in the pointer trashing and other
	debugging code.  If typeof is forbidden, then it would seem to
	require adding type arguments to several macros, a bad thing.

--- queue.h.diff begins here ---
--- queue.h	2008-01-02 22:53:54.000000000 -0600
+++ queue.h.new	2008-01-02 23:02:28.000000000 -0600
@@ -188,6 +188,7 @@ struct {								\
 #define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
 
 #define	SLIST_REMOVE(head, elm, type, field) do {			\
+	typeof (elm) oldelm = (elm);					\
 	if (SLIST_FIRST((head)) == (elm)) {				\
 		SLIST_REMOVE_HEAD((head), field);			\
 	}								\
@@ -198,7 +199,7 @@ struct {								\
 		SLIST_NEXT(curelm, field) =				\
 		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
 	}								\
-	TRASHIT((elm)->field.sle_next);					\
+	TRASHIT(oldelm->field.sle_next);					\
 } while (0)
 
 #define	SLIST_REMOVE_HEAD(head, field) do {				\
@@ -280,6 +281,7 @@ struct {								\
 #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
 
 #define	STAILQ_REMOVE(head, elm, type, field) do {			\
+	typeof (elm) oldelm = (elm);					\
 	if (STAILQ_FIRST((head)) == (elm)) {				\
 		STAILQ_REMOVE_HEAD((head), field);			\
 	}								\
@@ -291,7 +293,7 @@ struct {								\
 		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
 			(head)->stqh_last = &STAILQ_NEXT((curelm), field);\
 	}								\
-	TRASHIT((elm)->field.stqe_next);				\
+	TRASHIT(oldelm->field.stqe_next);				\
 } while (0)
 
 #define	STAILQ_REMOVE_HEAD(head, field) do {				\
@@ -392,14 +394,15 @@ struct {								\
 #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
 
 #define	LIST_REMOVE(elm, field) do {					\
+	typeof (elm) oldelm = (elm);					\
 	QMD_LIST_CHECK_NEXT(elm, field);				\
 	QMD_LIST_CHECK_PREV(elm, field);				\
 	if (LIST_NEXT((elm), field) != NULL)				\
 		LIST_NEXT((elm), field)->field.le_prev = 		\
 		    (elm)->field.le_prev;				\
 	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-	TRASHIT((elm)->field.le_next);					\
-	TRASHIT((elm)->field.le_prev);					\
+	TRASHIT(oldelm->field.le_next);					\
+	TRASHIT(oldelm->field.le_prev);					\
 } while (0)
 
 /*
@@ -554,6 +557,7 @@ struct {								\
 	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
 
 #define	TAILQ_REMOVE(head, elm, field) do {				\
+	typeof (elm) oldelm = (elm);					\
 	QMD_TAILQ_CHECK_NEXT(elm, field);				\
 	QMD_TAILQ_CHECK_PREV(elm, field);				\
 	if ((TAILQ_NEXT((elm), field)) != NULL)				\
@@ -564,9 +568,9 @@ struct {								\
 		QMD_TRACE_HEAD(head);					\
 	}								\
 	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-	TRASHIT((elm)->field.tqe_next);					\
-	TRASHIT((elm)->field.tqe_prev);					\
-	QMD_TRACE_ELEM(&(elm)->field);					\
+	TRASHIT(oldelm->field.tqe_next);				\
+	TRASHIT(oldelm->field.tqe_prev);				\
+	QMD_TRACE_ELEM(&oldelm->field);					\
 } while (0)
 
 
--- queue.h.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->emaste 
Responsible-Changed-By: rwatson 
Responsible-Changed-When: Fri Mar 7 12:33:22 UTC 2008 
Responsible-Changed-Why:  
Assign to Ed Maste, who has been involved in adding invariants support to 
queue(9). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119307 

From: Ed Maste <emaste@freebsd.org>
To: bug-followup@FreeBSD.org, dougm@ironport.com
Cc:  
Subject: Re: kern/119307: [queue] [patch] TRASHIT macro blasts list header if REMOVE invoked with header ref
Date: Tue, 30 Dec 2008 12:59:47 -0500

 --kORqDWCi7qDJ0mEj
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Would you care to test the attached patch, which achieves the same
 effect but doesn't rely on typeof()?
 
 It's still got a namespace issue with the new SAVELINK() macro, but the
 existing TRASHIT etc. macros have the same problem.
 
 -Ed
 
 --kORqDWCi7qDJ0mEj
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="queue.h.diff"
 
 --- queue.h.orig	2009-01-01 06:42:22.000000000 -0500
 +++ queue.h	2009-01-01 06:43:13.000000000 -0500
 @@ -111,6 +111,7 @@ struct qm_trace {
  
  #define	TRACEBUF	struct qm_trace trace;
  #define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
 +#define	SAVELINK(name, link) void **name = (void *)&(link)
  
  #define	QMD_TRACE_HEAD(head) do {					\
  	(head)->trace.prevline = (head)->trace.lastline;		\
 @@ -131,6 +132,7 @@ struct qm_trace {
  #define	QMD_TRACE_HEAD(head)
  #define	TRACEBUF
  #define	TRASHIT(x)
 +#define	SAVELINK(name, link)
  #endif	/* QUEUE_MACRO_DEBUG */
  
  /*
 @@ -188,6 +190,7 @@ struct {								\
  #define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
  
  #define	SLIST_REMOVE(head, elm, type, field) do {			\
 +	SAVELINK(oldnext, (elm)->field.sle_next);			\
  	if (SLIST_FIRST((head)) == (elm)) {				\
  		SLIST_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -198,7 +201,7 @@ struct {								\
  		SLIST_NEXT(curelm, field) =				\
  		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
  	}								\
 -	TRASHIT((elm)->field.sle_next);					\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define	SLIST_REMOVE_HEAD(head, field) do {				\
 @@ -280,6 +283,7 @@ struct {								\
  #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
  
  #define	STAILQ_REMOVE(head, elm, type, field) do {			\
 +	SAVELINK(oldnext, (elm)->field.stqe_next);			\
  	if (STAILQ_FIRST((head)) == (elm)) {				\
  		STAILQ_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -291,7 +295,7 @@ struct {								\
  		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
  			(head)->stqh_last = &STAILQ_NEXT((curelm), field);\
  	}								\
 -	TRASHIT((elm)->field.stqe_next);				\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define	STAILQ_REMOVE_HEAD(head, field) do {				\
 @@ -392,14 +396,16 @@ struct {								\
  #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
  
  #define	LIST_REMOVE(elm, field) do {					\
 +	SAVELINK(oldnext, (elm)->field.le_next);			\
 +	SAVELINK(oldprev, (elm)->field.le_prev);			\
  	QMD_LIST_CHECK_NEXT(elm, field);				\
  	QMD_LIST_CHECK_PREV(elm, field);				\
  	if (LIST_NEXT((elm), field) != NULL)				\
  		LIST_NEXT((elm), field)->field.le_prev = 		\
  		    (elm)->field.le_prev;				\
  	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.le_next);					\
 -	TRASHIT((elm)->field.le_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  } while (0)
  
  /*
 @@ -554,6 +560,8 @@ struct {								\
  	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
  
  #define	TAILQ_REMOVE(head, elm, field) do {				\
 +	SAVELINK(oldnext, (elm)->field.tqe_next);			\
 +	SAVELINK(oldprev, (elm)->field.tqe_prev);			\
  	QMD_TAILQ_CHECK_NEXT(elm, field);				\
  	QMD_TAILQ_CHECK_PREV(elm, field);				\
  	if ((TAILQ_NEXT((elm), field)) != NULL)				\
 @@ -564,8 +572,8 @@ struct {								\
  		QMD_TRACE_HEAD(head);					\
  	}								\
  	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.tqe_next);					\
 -	TRASHIT((elm)->field.tqe_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  	QMD_TRACE_ELEM(&(elm)->field);					\
  } while (0)
  
 
 --kORqDWCi7qDJ0mEj--
State-Changed-From-To: open->patched 
State-Changed-By: emaste 
State-Changed-When: Sat Feb 20 01:05:48 UTC 2010 
State-Changed-Why:  
Committed to HEAD as revision 204106. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119307 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/119307: commit references a PR
Date: Sat, 20 Feb 2010 01:05:40 +0000 (UTC)

 Author: emaste
 Date: Sat Feb 20 01:05:30 2010
 New Revision: 204106
 URL: http://svn.freebsd.org/changeset/base/204106
 
 Log:
   Avoid corrupting the list or queue if _REMOVE is invoked with a
   reference to the head.
   
   PR:		kern/119307
   MFC After:	1 week
 
 Modified:
   head/sys/sys/queue.h
 
 Modified: head/sys/sys/queue.h
 ==============================================================================
 --- head/sys/sys/queue.h	Sat Feb 20 00:19:21 2010	(r204105)
 +++ head/sys/sys/queue.h	Sat Feb 20 01:05:30 2010	(r204106)
 @@ -112,6 +112,7 @@ struct qm_trace {
  
  #define	TRACEBUF	struct qm_trace trace;
  #define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
 +#define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
  
  #define	QMD_TRACE_HEAD(head) do {					\
  	(head)->trace.prevline = (head)->trace.lastline;		\
 @@ -130,6 +131,7 @@ struct qm_trace {
  #else
  #define	QMD_TRACE_ELEM(elem)
  #define	QMD_TRACE_HEAD(head)
 +#define	QMD_SAVELINK(name, link)
  #define	TRACEBUF
  #define	TRASHIT(x)
  #endif	/* QUEUE_MACRO_DEBUG */
 @@ -189,6 +191,7 @@ struct {								\
  #define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
  
  #define	SLIST_REMOVE(head, elm, type, field) do {			\
 +	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\
  	if (SLIST_FIRST((head)) == (elm)) {				\
  		SLIST_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -198,7 +201,7 @@ struct {								\
  			curelm = SLIST_NEXT(curelm, field);		\
  		SLIST_REMOVE_AFTER(curelm, field);			\
  	}								\
 -	TRASHIT((elm)->field.sle_next);					\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define SLIST_REMOVE_AFTER(elm, field) do {				\
 @@ -285,6 +288,7 @@ struct {								\
  #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
  
  #define	STAILQ_REMOVE(head, elm, type, field) do {			\
 +	QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\
  	if (STAILQ_FIRST((head)) == (elm)) {				\
  		STAILQ_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -294,7 +298,7 @@ struct {								\
  			curelm = STAILQ_NEXT(curelm, field);		\
  		STAILQ_REMOVE_AFTER(head, curelm, field);		\
  	}								\
 -	TRASHIT((elm)->field.stqe_next);				\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define	STAILQ_REMOVE_HEAD(head, field) do {				\
 @@ -415,14 +419,16 @@ struct {								\
  #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
  
  #define	LIST_REMOVE(elm, field) do {					\
 +	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\
 +	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\
  	QMD_LIST_CHECK_NEXT(elm, field);				\
  	QMD_LIST_CHECK_PREV(elm, field);				\
  	if (LIST_NEXT((elm), field) != NULL)				\
  		LIST_NEXT((elm), field)->field.le_prev = 		\
  		    (elm)->field.le_prev;				\
  	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.le_next);					\
 -	TRASHIT((elm)->field.le_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  } while (0)
  
  #define LIST_SWAP(head1, head2, type, field) do {			\
 @@ -587,6 +593,8 @@ struct {								\
  	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
  
  #define	TAILQ_REMOVE(head, elm, field) do {				\
 +	QMD_SAVELINK(oldnext, (elm)->field.tqe_next);			\
 +	QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);			\
  	QMD_TAILQ_CHECK_NEXT(elm, field);				\
  	QMD_TAILQ_CHECK_PREV(elm, field);				\
  	if ((TAILQ_NEXT((elm), field)) != NULL)				\
 @@ -597,8 +605,8 @@ struct {								\
  		QMD_TRACE_HEAD(head);					\
  	}								\
  	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.tqe_next);					\
 -	TRASHIT((elm)->field.tqe_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  	QMD_TRACE_ELEM(&(elm)->field);					\
  } while (0)
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/119307: commit references a PR
Date: Sat, 27 Feb 2010 03:47:38 +0000 (UTC)

 Author: emaste
 Date: Sat Feb 27 03:47:22 2010
 New Revision: 204392
 URL: http://svn.freebsd.org/changeset/base/204392
 
 Log:
   MFC r204106:
   
     Avoid corrupting the list or queue if _REMOVE is invoked with a
     reference to the head.
   
   PR:		kern/119307
 
 Modified:
   stable/8/sys/sys/queue.h
 Directory Properties:
   stable/8/sys/   (props changed)
   stable/8/sys/amd64/include/xen/   (props changed)
   stable/8/sys/cddl/contrib/opensolaris/   (props changed)
   stable/8/sys/contrib/dev/acpica/   (props changed)
   stable/8/sys/contrib/pf/   (props changed)
   stable/8/sys/dev/xen/xenpci/   (props changed)
   stable/8/sys/netinet/   (props changed)
 
 Modified: stable/8/sys/sys/queue.h
 ==============================================================================
 --- stable/8/sys/sys/queue.h	Sat Feb 27 03:38:38 2010	(r204391)
 +++ stable/8/sys/sys/queue.h	Sat Feb 27 03:47:22 2010	(r204392)
 @@ -112,6 +112,7 @@ struct qm_trace {
  
  #define	TRACEBUF	struct qm_trace trace;
  #define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
 +#define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
  
  #define	QMD_TRACE_HEAD(head) do {					\
  	(head)->trace.prevline = (head)->trace.lastline;		\
 @@ -130,6 +131,7 @@ struct qm_trace {
  #else
  #define	QMD_TRACE_ELEM(elem)
  #define	QMD_TRACE_HEAD(head)
 +#define	QMD_SAVELINK(name, link)
  #define	TRACEBUF
  #define	TRASHIT(x)
  #endif	/* QUEUE_MACRO_DEBUG */
 @@ -189,6 +191,7 @@ struct {								\
  #define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
  
  #define	SLIST_REMOVE(head, elm, type, field) do {			\
 +	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\
  	if (SLIST_FIRST((head)) == (elm)) {				\
  		SLIST_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -198,7 +201,7 @@ struct {								\
  			curelm = SLIST_NEXT(curelm, field);		\
  		SLIST_REMOVE_AFTER(curelm, field);			\
  	}								\
 -	TRASHIT((elm)->field.sle_next);					\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define SLIST_REMOVE_AFTER(elm, field) do {				\
 @@ -285,6 +288,7 @@ struct {								\
  #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
  
  #define	STAILQ_REMOVE(head, elm, type, field) do {			\
 +	QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\
  	if (STAILQ_FIRST((head)) == (elm)) {				\
  		STAILQ_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -294,7 +298,7 @@ struct {								\
  			curelm = STAILQ_NEXT(curelm, field);		\
  		STAILQ_REMOVE_AFTER(head, curelm, field);		\
  	}								\
 -	TRASHIT((elm)->field.stqe_next);				\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define	STAILQ_REMOVE_HEAD(head, field) do {				\
 @@ -415,14 +419,16 @@ struct {								\
  #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
  
  #define	LIST_REMOVE(elm, field) do {					\
 +	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\
 +	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\
  	QMD_LIST_CHECK_NEXT(elm, field);				\
  	QMD_LIST_CHECK_PREV(elm, field);				\
  	if (LIST_NEXT((elm), field) != NULL)				\
  		LIST_NEXT((elm), field)->field.le_prev = 		\
  		    (elm)->field.le_prev;				\
  	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.le_next);					\
 -	TRASHIT((elm)->field.le_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  } while (0)
  
  #define LIST_SWAP(head1, head2, type, field) do {			\
 @@ -587,6 +593,8 @@ struct {								\
  	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
  
  #define	TAILQ_REMOVE(head, elm, field) do {				\
 +	QMD_SAVELINK(oldnext, (elm)->field.tqe_next);			\
 +	QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);			\
  	QMD_TAILQ_CHECK_NEXT(elm, field);				\
  	QMD_TAILQ_CHECK_PREV(elm, field);				\
  	if ((TAILQ_NEXT((elm), field)) != NULL)				\
 @@ -597,8 +605,8 @@ struct {								\
  		QMD_TRACE_HEAD(head);					\
  	}								\
  	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.tqe_next);					\
 -	TRASHIT((elm)->field.tqe_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  	QMD_TRACE_ELEM(&(elm)->field);					\
  } while (0)
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: emaste 
State-Changed-When: Sat Feb 27 04:02:52 UTC 2010 
State-Changed-Why:  
Merged to 8 and 7 now. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119307 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/119307: commit references a PR
Date: Sat, 27 Feb 2010 04:03:00 +0000 (UTC)

 Author: emaste
 Date: Sat Feb 27 04:02:40 2010
 New Revision: 204395
 URL: http://svn.freebsd.org/changeset/base/204395
 
 Log:
   MFC r204106:
   
     Avoid corrupting the list or queue if _REMOVE is invoked with a
     reference to the head.
   
   PR:		kern/119307
 
 Modified:
   stable/7/sys/sys/queue.h
 Directory Properties:
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/sys/sys/queue.h
 ==============================================================================
 --- stable/7/sys/sys/queue.h	Sat Feb 27 03:56:12 2010	(r204394)
 +++ stable/7/sys/sys/queue.h	Sat Feb 27 04:02:40 2010	(r204395)
 @@ -112,6 +112,7 @@ struct qm_trace {
  
  #define	TRACEBUF	struct qm_trace trace;
  #define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
 +#define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
  
  #define	QMD_TRACE_HEAD(head) do {					\
  	(head)->trace.prevline = (head)->trace.lastline;		\
 @@ -130,6 +131,7 @@ struct qm_trace {
  #else
  #define	QMD_TRACE_ELEM(elem)
  #define	QMD_TRACE_HEAD(head)
 +#define	QMD_SAVELINK(name, link)
  #define	TRACEBUF
  #define	TRASHIT(x)
  #endif	/* QUEUE_MACRO_DEBUG */
 @@ -189,6 +191,7 @@ struct {								\
  #define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
  
  #define	SLIST_REMOVE(head, elm, type, field) do {			\
 +	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\
  	if (SLIST_FIRST((head)) == (elm)) {				\
  		SLIST_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -198,7 +201,7 @@ struct {								\
  			curelm = SLIST_NEXT(curelm, field);		\
  		SLIST_REMOVE_AFTER(curelm, field);			\
  	}								\
 -	TRASHIT((elm)->field.sle_next);					\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define SLIST_REMOVE_AFTER(elm, field) do {				\
 @@ -285,6 +288,7 @@ struct {								\
  #define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
  
  #define	STAILQ_REMOVE(head, elm, type, field) do {			\
 +	QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\
  	if (STAILQ_FIRST((head)) == (elm)) {				\
  		STAILQ_REMOVE_HEAD((head), field);			\
  	}								\
 @@ -294,7 +298,7 @@ struct {								\
  			curelm = STAILQ_NEXT(curelm, field);		\
  		STAILQ_REMOVE_AFTER(head, curelm, field);		\
  	}								\
 -	TRASHIT((elm)->field.stqe_next);				\
 +	TRASHIT(*oldnext);						\
  } while (0)
  
  #define	STAILQ_REMOVE_HEAD(head, field) do {				\
 @@ -401,14 +405,16 @@ struct {								\
  #define	LIST_NEXT(elm, field)	((elm)->field.le_next)
  
  #define	LIST_REMOVE(elm, field) do {					\
 +	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\
 +	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\
  	QMD_LIST_CHECK_NEXT(elm, field);				\
  	QMD_LIST_CHECK_PREV(elm, field);				\
  	if (LIST_NEXT((elm), field) != NULL)				\
  		LIST_NEXT((elm), field)->field.le_prev = 		\
  		    (elm)->field.le_prev;				\
  	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.le_next);					\
 -	TRASHIT((elm)->field.le_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  } while (0)
  
  /*
 @@ -563,6 +569,8 @@ struct {								\
  	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
  
  #define	TAILQ_REMOVE(head, elm, field) do {				\
 +	QMD_SAVELINK(oldnext, (elm)->field.tqe_next);			\
 +	QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);			\
  	QMD_TAILQ_CHECK_NEXT(elm, field);				\
  	QMD_TAILQ_CHECK_PREV(elm, field);				\
  	if ((TAILQ_NEXT((elm), field)) != NULL)				\
 @@ -573,8 +581,8 @@ struct {								\
  		QMD_TRACE_HEAD(head);					\
  	}								\
  	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
 -	TRASHIT((elm)->field.tqe_next);					\
 -	TRASHIT((elm)->field.tqe_prev);					\
 +	TRASHIT(*oldnext);						\
 +	TRASHIT(*oldprev);						\
  	QMD_TRACE_ELEM(&(elm)->field);					\
  } while (0)
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
