From owner-svn-src-all@freebsd.org  Wed Jan  4 00:26:42 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 492BAC9C0AC;
 Wed,  4 Jan 2017 00:26:42 +0000 (UTC)
 (envelope-from avos@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 18E901029;
 Wed,  4 Jan 2017 00:26:42 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v040QfqB080034;
 Wed, 4 Jan 2017 00:26:41 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v040Qfrk080033;
 Wed, 4 Jan 2017 00:26:41 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201701040026.v040Qfrk080033@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Wed, 4 Jan 2017 00:26:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311206 - head/sys/dev/rtwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2017 00:26:42 -0000

Author: avos
Date: Wed Jan  4 00:26:41 2017
New Revision: 311206
URL: https://svnweb.freebsd.org/changeset/base/311206

Log:
  rtwn: fix possible buffer overrun.
  
  r297596 was not merged properly into new code; restore lost part.

Modified:
  head/sys/dev/rtwn/if_rtwnvar.h

Modified: head/sys/dev/rtwn/if_rtwnvar.h
==============================================================================
--- head/sys/dev/rtwn/if_rtwnvar.h	Wed Jan  4 00:25:22 2017	(r311205)
+++ head/sys/dev/rtwn/if_rtwnvar.h	Wed Jan  4 00:26:41 2017	(r311206)
@@ -26,7 +26,7 @@
 #define RTWN_TX_DESC_SIZE	64
 
 #define RTWN_RXBUFSZ		(8 * 1024)
-#define RTWN_TXBUFSZ		(RTWN_TX_DESC_SIZE + IEEE80211_MAX_LEN)
+#define RTWN_TXBUFSZ		(16 * 1024)
 
 #define RTWN_BCN_MAX_SIZE	512
 #define RTWN_CAM_ENTRY_LIMIT	64