From 2e155305e771db2e2f73dc82de2a1f67d14eda4b Mon Sep 17 00:00:00 2001
From: Luiz Souza <luiz@netgate.com>
Date: Tue, 17 Oct 2017 17:45:46 -0200
Subject: [PATCH] Use the new function to validate the VLAN tags.

---
 src/etc/inc/interfaces.inc                 | 8 +++-----
 src/usr/local/www/interfaces_vlan_edit.php | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 7736e964e6..fed94690dc 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -294,8 +294,7 @@ function interface_is_vlan($if = NULL) {
 
 	/* Check basic format. */
 	list($vlanif, $vlantag) = explode(".", $if);
-	if (empty($vlanif) || empty($vlantag) ||
-	    intval($vlantag) < 0 || intval($vlantag) > 4094) {
+	if (empty($vlanif) || empty($vlantag) || !vlan_valid_tag($vlantag)) {
 		return (NULL);
 	}
 
@@ -311,9 +310,8 @@ function interface_is_vlan($if = NULL) {
 
 function vlan_interface($vlan = NULL) {
 
-	if ($vlan == NULL || !is_array($vlan) ||
-	    !isset($vlan['if']) || !isset($vlan['tag']) ||
-	    intval($vlan['tag']) < 0 || intval($vlan['tag']) > 4094) {
+	if ($vlan == NULL || !is_array($vlan) || !isset($vlan['if']) ||
+	    !isset($vlan['tag']) || !vlan_valid_tag($vlan['tag'])) {
 		return (NULL);
 	}
 	return ("{$vlan['if']}.{$vlan['tag']}");
diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php
index fbceb3c153..b68ce3b463 100644
--- a/src/usr/local/www/interfaces_vlan_edit.php
+++ b/src/usr/local/www/interfaces_vlan_edit.php
@@ -70,7 +70,7 @@ if ($_POST['save']) {
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
 
-	if (isset($_POST['tag']) && (!is_numericint($_POST['tag']) || ($_POST['tag'] < '1') || ($_POST['tag'] > '4094'))) {
+	if (isset($_POST['tag']) && !vlan_valid_tag($_POST['tag'])) {
 		$input_errors[] = gettext("The VLAN tag must be an integer between 1 and 4094.");
 	}
 	if (isset($_POST['pcp']) && !empty($_POST['pcp']) && (!is_numericint($_POST['pcp']) || ($_POST['pcp'] < '0') || ($_POST['pcp'] > '7'))) {