From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amos Kong Subject: Re: [PATCH] net: fix checking boundary of valid vlan id Date: Sun, 30 Dec 2012 14:39:42 +0800 Message-ID: <20121230063942.GA22499@t430s.redhat.com> References: <1356848931-22193-1-git-send-email-akong@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: davem@davemloft.net To: netdev@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33001 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751328Ab2L3Gjr (ORCPT ); Sun, 30 Dec 2012 01:39:47 -0500 Content-Disposition: inline In-Reply-To: <1356848931-22193-1-git-send-email-akong@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Sun, Dec 30, 2012 at 02:28:51PM +0800, akong@redhat.com wrote: > From: Amos Kong > > 4096 is not a valid vlan id. > > Signed-off-by: Amos Kong > --- > net/bridge/netfilter/ebt_vlan.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c > index eae67bf..b279ec0 100644 > --- a/net/bridge/netfilter/ebt_vlan.c > +++ b/net/bridge/netfilter/ebt_vlan.c > @@ -121,8 +121,8 @@ static int ebt_vlan_mt_check(const struct xt_mtchk_param *par) > * if_vlan.h: VLAN_N_VID 4096. */ > if (GET_BITMASK(EBT_VLAN_ID)) { > if (!!info->id) { /* if id!=0 => check vid range */ > - if (info->id > VLAN_N_VID) { > - pr_debug("id %d is out of range (1-4096)\n", > + if (info->id >= VLAN_N_VID) { > + pr_debug("id %d is out of range (1-4095)\n", Hi David, 4095 is reserved, treat it as invalid here? if (info->id >= VLAN_N_VID - 1) { pr_debug("id %d is out of range (1-4094)\n", > info->id); > return -EINVAL; > } > -- > 1.7.11.7