From owner-svn-src-stable-9@freebsd.org  Sun May 15 15:26:20 2016
Return-Path: <owner-svn-src-stable-9@freebsd.org>
Delivered-To: svn-src-stable-9@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 AA243B3C089;
 Sun, 15 May 2016 15:26:20 +0000 (UTC) (envelope-from cy@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 7235311AF;
 Sun, 15 May 2016 15:26:20 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FFQJFj079246;
 Sun, 15 May 2016 15:26:19 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4FFQJ7l079245;
 Sun, 15 May 2016 15:26:19 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201605151526.u4FFQJ7l079245@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sun, 15 May 2016 15:26:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r299857 - stable/9/sys/contrib/ipfilter/netinet
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 May 2016 15:26:20 -0000

Author: cy
Date: Sun May 15 15:26:19 2016
New Revision: 299857
URL: https://svnweb.freebsd.org/changeset/base/299857

Log:
  Fix:
  IP Filter bug 1835705: It is impossible to delete a state using
  SIOCDELST ioctl.
  
  This is a direct commit to the stable/9 branch because this patch was
  already included in the ipfilter 5.1.2 import in r254562. It was
  ultimately included in ipfilter 4.1.29 (whereas stable/9 uses 4.1.28).
  
  Obtained from:	ipfilter CVS repo: ip_state.c r1.13

Modified:
  stable/9/sys/contrib/ipfilter/netinet/ip_state.c

Modified: stable/9/sys/contrib/ipfilter/netinet/ip_state.c
==============================================================================
--- stable/9/sys/contrib/ipfilter/netinet/ip_state.c	Sun May 15 15:14:46 2016	(r299856)
+++ stable/9/sys/contrib/ipfilter/netinet/ip_state.c	Sun May 15 15:26:19 2016	(r299857)
@@ -421,7 +421,7 @@ caddr_t data;
 		if ((sp->is_p == st.is_p) && (sp->is_v == st.is_v) &&
 		    !bcmp((caddr_t)&sp->is_src, (caddr_t)&st.is_src,
 			  sizeof(st.is_src)) &&
-		    !bcmp((caddr_t)&sp->is_dst, (caddr_t)&st.is_src,
+		    !bcmp((caddr_t)&sp->is_dst, (caddr_t)&st.is_dst,
 			  sizeof(st.is_dst)) &&
 		    !bcmp((caddr_t)&sp->is_ps, (caddr_t)&st.is_ps,
 			  sizeof(st.is_ps))) {