Patchwork net: fix checking boundary of valid vlan id

login
register
mail settings
Submitter Amos Kong
Date Dec. 30, 2012, 9:21 a.m.
Message ID <1356859307-26205-1-git-send-email-akong@redhat.com>
Download mbox | patch
Permalink /patch/208736/
State Not Applicable
Headers show

Comments

Amos Kong - Dec. 30, 2012, 9:21 a.m.
From: Amos Kong <akong@redhat.com>

According to IEEE 802.1Q, 4096 is not a valid vlan id, 4095 is reserved.

Signed-off-by: Amos Kong <akong@redhat.com>
---
 net/bridge/netfilter/ebt_vlan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c
index eae67bf..5bdebc3 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 - 1) {
+				pr_debug("id %d is out of range (1-4094)\n",
 					 info->id);
 				return -EINVAL;
 			}