mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-01-30 10:44:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

DHCP: fix a crash when dhcp_option has a wrong value

Browse source
This commit is contained in:
Amin Ben Ramdhane 2021-01-04 22:33:40 +01:00
parent 3f9767796f
commit 8a369fda5d
3 changed files with 41 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dmtree/tr181/dhcpv4.c
View file

@ -2177,9 +2177,9 @@ static int set_DHCPv4ClientReqOption_Tag(char *refparam, struct dmctx *ctx, void
static int get_DHCPv4ServerPoolOption_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
struct uci_list *dhcp_option_list;
struct uci_list *dhcp_option_list = NULL;
struct uci_element *e;
char **buf;
char **buf = NULL;
size_t length;
if (strcmp(((struct dhcp_client_option_args *)data)->option_tag, "0") == 0) {
@ -2190,7 +2190,7 @@ static int get_DHCPv4ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
if (dhcp_option_list != NULL) {
uci_foreach_element(dhcp_option_list, e) {
buf = strsplit(e->name, ",", &length);
if (strcmp(buf[0], ((struct dhcp_client_option_args *)data)->option_tag) == 0) {
if (buf && *buf && strcmp(buf[0], ((struct dhcp_client_option_args *)data)->option_tag) == 0) {
*value = "1";
return 0;
}
@ -2202,9 +2202,9 @@ static int get_DHCPv4ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
static int set_DHCPv4ServerPoolOption_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
struct uci_list *dhcp_option_list;
struct uci_list *dhcp_option_list = NULL;
struct uci_element *e;
char **buf, *opt_value;
char **buf = NULL, *opt_value;
size_t length;
bool test = false, b;
@ -2222,7 +2222,7 @@ static int set_DHCPv4ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
if (dhcp_option_list != NULL) {
uci_foreach_element(dhcp_option_list, e) {
buf = strsplit(e->name, ",", &length);
if (strcmp(buf[0], ((struct dhcp_client_option_args *)data)->option_tag) == 0) {
if (buf && *buf && strcmp(buf[0], ((struct dhcp_client_option_args *)data)->option_tag) == 0) {
test = true;
if (!b)
dmuci_del_list_value_by_section(((struct dhcp_client_option_args *)data)->client_sect, "dhcp_option", opt_value);
@ -2285,7 +2285,7 @@ static int get_DHCPv4ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, voi
static int set_DHCPv4ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *opttagvalue, **option, *oldopttagvalue;
char *opttagvalue, **option = NULL, *oldopttagvalue;
size_t length;
struct uci_list *dhcp_option_list = NULL;
struct uci_element *e;
@ -2300,7 +2300,7 @@ static int set_DHCPv4ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, voi
return 0;
uci_foreach_element(dhcp_option_list, e) {
option = strsplit(e->name, ",", &length);
if (strcmp(option[0], value)==0)
if (option && *option && strcmp(option[0], value) == 0)
return FAULT_9007;
}
break;
@ -2329,7 +2329,7 @@ static int get_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, v
static int set_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *opttagvalue, **option, *oldopttagvalue;
char *opttagvalue, **option = NULL, *oldopttagvalue;
size_t length;
struct uci_list *dhcp_option_list = NULL;
struct uci_element *e;
@ -2349,7 +2349,7 @@ static int set_DHCPv4ServerPoolOption_Value(char *refparam, struct dmctx *ctx, v
uci_foreach_element(dhcp_option_list, e) {
option = strsplit(e->name, ",", &length);
if (strcmp(option[0], res) == 0)
if (option && *option && strcmp(option[0], res) == 0)
return FAULT_9007;
}
dmasprintf(&oldopttagvalue, "%s,%s", ((struct dhcp_client_option_args *)data)->option_tag, ((struct dhcp_client_option_args *)data)->value);
@ -2923,12 +2923,15 @@ static int browseDHCPv4ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_
if (dhcp_options_list != NULL) {
uci_foreach_element(dhcp_options_list, e) {
tagvalue = strsplit(e->name, ",", &length);
if (!tagvalue)
continue;
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcp", "servpool_option", section_name(curr_dhcp_args->dhcp_sec), "option_tag", tagvalue[0])) == NULL) {
dmuci_add_section_bbfdm("dmmap_dhcp", "servpool_option", &dmmap_sect);
dmuci_set_value_by_section_bbfdm(dmmap_sect, "option_tag", tagvalue[0]);
dmuci_set_value_by_section_bbfdm(dmmap_sect, "section_name", section_name(curr_dhcp_args->dhcp_sec));
}
optionvalue = dmstrdup(tagvalue[1]);
optionvalue = dmstrdup(length > 1 ? tagvalue[1] : "");
if (length > 2) {
for (j = 2; j < length; j++) {
tmp = dmstrdup(optionvalue);
@ -2949,8 +2952,8 @@ static int browseDHCPv4ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_
dhcp_client_opt_args.client_sect = curr_dhcp_args->dhcp_sec;
dhcp_client_opt_args.opt_sect = dmmap_sect;
dhcp_client_opt_args.option_tag = dmstrdup(dhcpv4_tag);
dhcp_client_opt_args.value = dmstrdup(dhcpv4_value);
dhcp_client_opt_args.option_tag = dhcpv4_tag;
dhcp_client_opt_args.value = dhcpv4_value;
browse_args.option = "section_name";
browse_args.value = section_name(curr_dhcp_args->dhcp_sec);

43
dmtree/tr181/dhcpv6.c
View file

@ -183,27 +183,30 @@ static int browseDHCPv6ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_
struct dhcpv6_args *curr_dhcp_args = (struct dhcpv6_args*)prev_data;
struct uci_section *dmmap_sect;
struct browse_args browse_args = {0};
char **tagvalue = NULL, *inst, *max_inst = NULL, *optionvalue= NULL, *tmp, *dhcpv6_tag, *dhcpv6_value;
char **dhcpv6_option = NULL, *inst, *max_inst = NULL, *optionvalue= NULL, *tmp, *dhcpv6_tag, *dhcpv6_value;
size_t length;
int j;
struct dhcpv6_client_option_args dhcp_client_opt_args = {0};
struct dhcpv6_client_option_args dhcpv6_client_opt_args = {0};
dmuci_get_value_by_section_list(curr_dhcp_args->dhcp_sec, "dhcp_option", &dhcp_options_list);
if (dhcp_options_list != NULL) {
uci_foreach_element(dhcp_options_list, e) {
tagvalue = strsplit(e->name, ",", &length);
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcpv6", "servpool_option", section_name(curr_dhcp_args->dhcp_sec), "option_tag", tagvalue[0])) == NULL) {
dhcpv6_option = strsplit(e->name, ",", &length);
if (!dhcpv6_option)
continue;
if ((dmmap_sect = get_dup_section_in_dmmap_eq("dmmap_dhcpv6", "servpool_option", section_name(curr_dhcp_args->dhcp_sec), "option_tag", dhcpv6_option[0])) == NULL) {
dmuci_add_section_bbfdm("dmmap_dhcpv6", "servpool_option", &dmmap_sect);
dmuci_set_value_by_section_bbfdm(dmmap_sect, "option_tag", tagvalue[0]);
dmuci_set_value_by_section_bbfdm(dmmap_sect, "option_tag", dhcpv6_option[0]);
dmuci_set_value_by_section_bbfdm(dmmap_sect, "section_name", section_name(curr_dhcp_args->dhcp_sec));
}
optionvalue=dmstrdup(length>1?tagvalue[1]:"");
optionvalue = dmstrdup(length > 1 ? dhcpv6_option[1] : "");
if (length > 2) {
for (j = 2; j < length; j++){
tmp=dmstrdup(optionvalue);
tmp = dmstrdup(optionvalue);
dmfree(optionvalue);
optionvalue = NULL;
dmasprintf(&optionvalue, "%s,%s", tmp, tagvalue[j]);
dmasprintf(&optionvalue, "%s,%s", tmp, dhcpv6_option[j]);
dmfree(tmp);
tmp = NULL;
}
@ -216,10 +219,10 @@ static int browseDHCPv6ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_
dmuci_get_value_by_section_string(dmmap_sect, "option_tag", &dhcpv6_tag);
dmuci_get_value_by_section_string(dmmap_sect, "option_value", &dhcpv6_value);
dhcp_client_opt_args.client_sect = curr_dhcp_args->dhcp_sec;
dhcp_client_opt_args.opt_sect = dmmap_sect;
dhcp_client_opt_args.option_tag = dmstrdup(dhcpv6_tag);
dhcp_client_opt_args.value = dmstrdup(dhcpv6_value);
dhcpv6_client_opt_args.client_sect = curr_dhcp_args->dhcp_sec;
dhcpv6_client_opt_args.opt_sect = dmmap_sect;
dhcpv6_client_opt_args.option_tag = dhcpv6_tag;
dhcpv6_client_opt_args.value = dhcpv6_value;
browse_args.option = "section_name";
browse_args.value = section_name(curr_dhcp_args->dhcp_sec);
@ -228,7 +231,7 @@ static int browseDHCPv6ServerPoolOptionInst(struct dmctx *dmctx, DMNODE *parent_
dmmap_sect, "bbf_dhcpv6_servpool_option_instance", "bbf_dhcpv6_servpool_option_alias",
check_browse_section, (void *)&browse_args);
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&dhcp_client_opt_args, inst) == DM_STOP)
if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&dhcpv6_client_opt_args, inst) == DM_STOP)
break;
}
return 0;
@ -1147,7 +1150,7 @@ static int get_DHCPv6ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
{
struct uci_list *dhcp_option_list;
struct uci_element *e;
char **buf;
char **buf = NULL;
size_t length;
if(strcmp(((struct dhcpv6_client_option_args *)data)->option_tag, "0") == 0){
@ -1159,7 +1162,7 @@ static int get_DHCPv6ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
if (dhcp_option_list != NULL) {
uci_foreach_element(dhcp_option_list, e) {
buf = strsplit(e->name, ",", &length);
if (strcmp(buf[0], ((struct dhcpv6_client_option_args *)data)->option_tag) == 0) {
if (buf && *buf && strcmp(buf[0], ((struct dhcpv6_client_option_args *)data)->option_tag) == 0) {
*value = "1";
return 0;
}
@ -1195,7 +1198,7 @@ static int set_DHCPv6ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
if (dhcp_option_list != NULL) {
uci_foreach_element(dhcp_option_list, e) {
buf = strsplit(e->name, ",", &length);
if (strcmp(buf[0], ((struct dhcpv6_client_option_args *)data)->option_tag) == 0) {
if (buf && *buf && strcmp(buf[0], ((struct dhcpv6_client_option_args *)data)->option_tag) == 0) {
test = true;
if (!b)
dmuci_del_list_value_by_section(((struct dhcpv6_client_option_args *)data)->client_sect, "dhcp_option", opt_value);
@ -1240,7 +1243,7 @@ static int get_DHCPv6ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, voi
static int set_DHCPv6ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *opttagvalue, **option, *oldopttagvalue;
char *opttagvalue, **option = NULL, *oldopttagvalue;
size_t length;
struct uci_list *dhcp_option_list= NULL;
struct uci_element *e;
@ -1257,7 +1260,7 @@ static int set_DHCPv6ServerPoolOption_Tag(char *refparam, struct dmctx *ctx, voi
uci_foreach_element(dhcp_option_list, e) {
option = strsplit(e->name, ",", &length);
if (strcmp(option[0], value)==0)
if (option && *option && strcmp(option[0], value)==0)
return FAULT_9007;
}
break;
@ -1287,7 +1290,7 @@ static int get_DHCPv6ServerPoolOption_Value(char *refparam, struct dmctx *ctx, v
static int set_DHCPv6ServerPoolOption_Value(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *opttagvalue, **option, *oldopttagvalue;
char *opttagvalue, **option = NULL, *oldopttagvalue;
size_t length;
struct uci_list *dhcp_option_list = NULL;
struct uci_element *e;
@ -1307,7 +1310,7 @@ static int set_DHCPv6ServerPoolOption_Value(char *refparam, struct dmctx *ctx, v
uci_foreach_element(dhcp_option_list, e) {
option = strsplit(e->name, ",", &length);
if (strcmp(option[0], res) == 0)
if (option && *option && strcmp(option[0], res) == 0)
return FAULT_9007;
}
dmasprintf(&oldopttagvalue, "%s,%s", ((struct dhcpv6_client_option_args *)data)->option_tag, ((struct dhcpv6_client_option_args *)data)->value);

4
libbbf_api/dmcommon.c
View file

@ -398,14 +398,14 @@ struct uci_section *get_dup_section_in_dmmap_opt(char *dmmap_package, char *sect
return NULL;
}
struct uci_section *get_dup_section_in_dmmap_eq(char *dmmap_package, char* section_type, char*sect_name, char *opt_name, char* opt_value)
struct uci_section *get_dup_section_in_dmmap_eq(char *dmmap_package, char* section_type, char*sect_name, char *opt_name, char *opt_value)
{
struct uci_section *s;
char *v;
uci_path_foreach_option_eq(bbfdm, dmmap_package, section_type, "section_name", sect_name, s) {
dmuci_get_value_by_section_string(s, opt_name, &v);
if (strcmp(v, opt_value) == 0)
if (opt_value && strcmp(v, opt_value) == 0)
return s;
}
return NULL;