From owner-p4-projects@FreeBSD.ORG  Fri Jun  3 05:40:26 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE3891065672; Fri,  3 Jun 2011 05:40:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A073E106564A
	for <perforce@FreeBSD.org>; Fri,  3 Jun 2011 05:40:25 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 7669A8FC14
	for <perforce@FreeBSD.org>; Fri,  3 Jun 2011 05:40:25 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p535eP8I007344
	for <perforce@FreeBSD.org>; Fri, 3 Jun 2011 05:40:25 GMT
	(envelope-from syuu@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p535ePaI007341
	for perforce@freebsd.org; Fri, 3 Jun 2011 05:40:25 GMT
	(envelope-from syuu@FreeBSD.org)
Date: Fri, 3 Jun 2011 05:40:25 GMT
Message-Id: <201106030540.p535ePaI007341@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	syuu@FreeBSD.org using -f
From: Takuya ASADA <syuu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 194138 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jun 2011 05:40:26 -0000

http://p4web.freebsd.org/@@194138?ac=10

Change 194138 by syuu@x200 on 2011/06/03 05:39:56

	index size check on ioctl

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#4 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/net/if_var.h#3 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#4 (text+ko) ====

@@ -1614,7 +1614,13 @@
 				error = EINVAL;
 				break;
 			}
+			struct ifnet *const ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
+			if (index > ifp->if_rxq_num) {
+				log(LOG_DEBUG, "index too large\n");
+				error = EINVAL;
+				break;
+			}
 			log(LOG_DEBUG, "index:%d\n", index);
 			d->bd_qmask.qm_rxq_mask[index] = TRUE;
 			break;
@@ -1637,7 +1643,13 @@
 				error = EINVAL;
 				break;
 			}
+			struct ifnet *const ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
+			if (index > ifp->if_rxq_num) {
+				log(LOG_DEBUG, "index too large\n");
+				error = EINVAL;
+				break;
+			}
 			log(LOG_DEBUG, "index:%d\n", index);
 			d->bd_qmask.qm_rxq_mask[index] = FALSE;
 			break;
@@ -1660,7 +1672,13 @@
 				error = EINVAL;
 				break;
 			}
+			struct ifnet *const ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
+			if (index > ifp->if_rxq_num) {
+				log(LOG_DEBUG, "index too large\n");
+				error = EINVAL;
+				break;
+			}
 			log(LOG_DEBUG, "index:%d\n", index);
 			*(uint32_t *)addr = d->bd_qmask.qm_rxq_mask[index];
 			break;
@@ -1683,7 +1701,13 @@
 				error = EINVAL;
 				break;
 			}
+			struct ifnet *const ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
+			if (index > ifp->if_txq_num) {
+				log(LOG_DEBUG, "index too large\n");
+				error = EINVAL;
+				break;
+			}
 			log(LOG_DEBUG, "index:%d\n", index);
 			d->bd_qmask.qm_txq_mask[index] = TRUE;
 			break;
@@ -1706,7 +1730,13 @@
 				error = EINVAL;
 				break;
 			}
+			struct ifnet *const ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
+			if (index > ifp->if_txq_num) {
+				log(LOG_DEBUG, "index too large\n");
+				error = EINVAL;
+				break;
+			}
 			log(LOG_DEBUG, "index:%d\n", index);
 			d->bd_qmask.qm_txq_mask[index] = FALSE;
 			break;
@@ -1729,7 +1759,13 @@
 				error = EINVAL;
 				break;
 			}
+			struct ifnet *const ifp = d->bd_bif->bif_ifp;
 			index = *(uint32_t *)addr;
+			if (index > ifp->if_txq_num) {
+				log(LOG_DEBUG, "index too large\n");
+				error = EINVAL;
+				break;
+			}
 			log(LOG_DEBUG, "index:%d\n", index);
 			*(uint32_t *)addr = d->bd_qmask.qm_txq_mask[index];
 			break;

==== //depot/projects/soc2011/mq_bpf/src/sys/net/if_var.h#3 (text+ko) ====