From owner-cvs-src@FreeBSD.ORG Tue Aug 1 17:28:11 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 537F016A4EF; Tue, 1 Aug 2006 17:28:11 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D5F243D6B; Tue, 1 Aug 2006 17:28:11 +0000 (GMT) (envelope-from qingli@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71HSAh5019498; Tue, 1 Aug 2006 17:28:10 GMT (envelope-from qingli@repoman.freebsd.org) Received: (from qingli@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71HSA9m019497; Tue, 1 Aug 2006 17:28:10 GMT (envelope-from qingli) Message-Id: <200608011728.k71HSA9m019497@repoman.freebsd.org> From: Qing Li Date: Tue, 1 Aug 2006 17:28:10 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/net if_vlan.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 17:28:11 -0000 qingli 2006-08-01 17:28:10 UTC FreeBSD src repository Modified files: sys/net if_vlan.c Log: In vlan_input(), if the network interface does not perform h/w based vlan tag processing, the code will use bcopy() to remove the vlan tag field but the code copies 2 bytes too many, which essentially overwrites the protocol type field. Also, a tag value of -1 is generated for unrecognized interface type, which would cause an invalid memory access in the vlans[] array. In addition, removed a line of dead code and its associated comments. Reviewed by: sam Revision Changes Path 1.107 +9 -15 src/sys/net/if_vlan.c