From owner-svn-src-head@freebsd.org  Wed Jan 27 02:08:31 2016
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 83256A6E477;
 Wed, 27 Jan 2016 02:08:31 +0000 (UTC)
 (envelope-from luigi@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 5516C677;
 Wed, 27 Jan 2016 02:08:31 +0000 (UTC)
 (envelope-from luigi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0R28U07056478;
 Wed, 27 Jan 2016 02:08:30 GMT (envelope-from luigi@FreeBSD.org)
Received: (from luigi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0R28UdV056477;
 Wed, 27 Jan 2016 02:08:30 GMT (envelope-from luigi@FreeBSD.org)
Message-Id: <201601270208.u0R28UdV056477@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: luigi set sender to
 luigi@FreeBSD.org using -f
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Wed, 27 Jan 2016 02:08:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294879 - head/sys/netpfil/ipfw
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jan 2016 02:08:31 -0000

Author: luigi
Date: Wed Jan 27 02:08:30 2016
New Revision: 294879
URL: https://svnweb.freebsd.org/changeset/base/294879

Log:
  bugfix: the scheduler template (dn_schk) for the round robin scheduler
  is followed by another structure (rr_schk) whose size must be set
  in the schk_datalen field of the descriptor.
  Not allocating the memory may cause other memory to be overwritten
  (though dn_schk is 192 bytes and rr_schk only 12 so we may be lucky
  and end up in the padding after the dn_schk).
  
  This is a merge candidate for stable and 10.3
  
  MFC after:	3 days

Modified:
  head/sys/netpfil/ipfw/dn_sched_rr.c

Modified: head/sys/netpfil/ipfw/dn_sched_rr.c
==============================================================================
--- head/sys/netpfil/ipfw/dn_sched_rr.c	Wed Jan 27 01:33:26 2016	(r294878)
+++ head/sys/netpfil/ipfw/dn_sched_rr.c	Wed Jan 27 02:08:30 2016	(r294879)
@@ -294,7 +294,7 @@ static struct dn_alg rr_desc = {
 	_SI( .name = ) "RR",
 	_SI( .flags = ) DN_MULTIQUEUE,
 
-	_SI( .schk_datalen = ) 0,
+	_SI( .schk_datalen = ) sizeof(struct rr_schk),
 	_SI( .si_datalen = ) sizeof(struct rr_si),
 	_SI( .q_datalen = ) sizeof(struct rr_queue) - sizeof(struct dn_queue),
 
@@ -311,5 +311,6 @@ static struct dn_alg rr_desc = {
 	_SI( .free_queue = ) rr_free_queue,
 };
 
+_Static_assert(sizeof(struct dn_schk) < 193, "a");
 
 DECLARE_DNSCHED_MODULE(dn_rr, &rr_desc);