From 6d7d64f99acce9a6cae2e7db47a8d470bf429317 Mon Sep 17 00:00:00 2001
From: vdutta <vivek.dutta@iopsys.eu>
Date: Wed, 11 May 2022 17:33:23 +0530
Subject: [PATCH] Added validation for ExternalPortEndRange

---
 dmtree/tr181/nat.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/dmtree/tr181/nat.c b/dmtree/tr181/nat.c
index 3c8fd387..4e965eaa 100644
--- a/dmtree/tr181/nat.c
+++ b/dmtree/tr181/nat.c
@@ -582,11 +582,24 @@ static int get_nat_port_mapping_external_port_end_range(char *refparam, struct d
 static int set_nat_port_mapping_external_port_end_range(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
 {
 	char *src_dport = NULL, *tmp = NULL, buffer[64];
+	uint16_t sport, dport;
 
 	switch (action) {
 		case VALUECHECK:
 			if (dm_validate_unsignedInt(value, RANGE_ARGS{{"0","65535"}}, 1))
 				return FAULT_9007;
+
+			// Add check to check if the endrange > src_dport
+			dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "src_dport", &src_dport);
+			tmp = src_dport ? DM_STRCHR(src_dport, ':') : NULL;
+			if (tmp)
+				*tmp = '\0';
+
+			sport = DM_STRTOL(src_dport);
+			dport = DM_STRTOL(value);
+			if (dport != 0 && dport < sport)
+				return FAULT_9007;
+
 			return 0;
 		case VALUESET:
 			dmuci_get_value_by_section_string(((struct dmmap_dup *)data)->config_section, "src_dport", &src_dport);
@@ -594,10 +607,13 @@ static int set_nat_port_mapping_external_port_end_range(char *refparam, struct d
 			if (tmp)
 				*tmp = '\0';
 
-			if ((src_dport[0] == '\0'))
-				snprintf(buffer, sizeof(buffer), "%s:%s", "0", value);
+			sport = DM_STRTOL(src_dport);
+			dport = DM_STRTOL(value);
+
+			if (dport) // if not 0
+				snprintf(buffer, sizeof(buffer), "%d:%d", sport, dport);
 			else
-				snprintf(buffer, sizeof(buffer), "%s:%s", src_dport, value);
+				snprintf(buffer, sizeof(buffer), "%d", sport);
 
 			dmuci_set_value_by_section(((struct dmmap_dup *)data)->config_section, "src_dport", buffer);
 			return 0;