firewall3: check the return value of fw3_parse_options()

[project/firewall3.git] / utils.c

diff --git a/utils.c b/utils.c
index cb478bb..875a141 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *

- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>

  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -463,11 +463,6 @@ write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
        uci_set(ctx, &ptr);
 
        ptr.o      = NULL;
        uci_set(ctx, &ptr);
 
        ptr.o      = NULL;

-       ptr.option = "conntrack";
-       ptr.value  = z->conntrack ? "1" : "0";
-       uci_set(ctx, &ptr);
-
-       ptr.o      = NULL;

        ptr.option = "mtu_fix";
        ptr.value  = z->mtu_fix ? "1" : "0";
        uci_set(ctx, &ptr);
        ptr.option = "mtu_fix";
        ptr.value  = z->mtu_fix ? "1" : "0";
        uci_set(ctx, &ptr);


@@ -490,18 +485,21 @@ write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
 
        fw3_foreach(dev, &z->devices)
        {
 
        fw3_foreach(dev, &z->devices)
        {

+               char *ep;
+

                if (!dev)
                        continue;
 
                p = buf;
                if (!dev)
                        continue;
 
                p = buf;

+               ep = buf + sizeof(buf);

 
                if (dev->invert)
 
                if (dev->invert)

-                       p += sprintf(p, "!");
+                       p += snprintf(p, ep - p, "!");

 
                if (*dev->network)
 
                if (*dev->network)

-                       p += sprintf(p, "%s@%s", dev->name, dev->network);
+                       p += snprintf(p, ep - p, "%s@%s", dev->name, dev->network);

                else
                else

-                       p += sprintf(p, "%s", dev->name);
+                       p += snprintf(p, ep - p, "%s", dev->name);

 
                ptr.value = buf;
                uci_add_list(ctx, &ptr);
 
                ptr.value = buf;
                uci_add_list(ctx, &ptr);


@@ -774,6 +772,7 @@ bool
 fw3_bitlen2netmask(int family, int bits, void *mask)
 {
        int i;
 fw3_bitlen2netmask(int family, int bits, void *mask)
 {
        int i;

+       uint8_t rem, b;

        struct in_addr *v4;
        struct in6_addr *v6;
 
        struct in_addr *v4;
        struct in6_addr *v6;
 


@@ -783,14 +782,17 @@ fw3_bitlen2netmask(int family, int bits, void *mask)
                        return false;
 
                v6 = mask;
                        return false;
 
                v6 = mask;

-               i = abs(bits);
+               rem = abs(bits);

 
 

-               memset(v6->s6_addr, 0xff, i / 8);
-               memset(v6->s6_addr + (i / 8) + 1, 0, (128 - i) / 8);
-               v6->s6_addr[i / 8] = 0xff << (8 - (i & 7));
+               for (i = 0; i < sizeof(v6->s6_addr); i++)
+               {
+                       b = (rem > 8) ? 8 : rem;
+                       v6->s6_addr[i] = (uint8_t)(0xFF << (8 - b));
+                       rem -= b;
+               }

 
                if (bits < 0)
 
                if (bits < 0)

-                       for (i = 0; i < 16; i++)
+                       for (i = 0; i < sizeof(v6->s6_addr); i++)

                                v6->s6_addr[i] = ~v6->s6_addr[i];
        }
        else
                                v6->s6_addr[i] = ~v6->s6_addr[i];
        }
        else


@@ -799,7 +801,7 @@ fw3_bitlen2netmask(int family, int bits, void *mask)
                        return false;
 
                v4 = mask;
                        return false;
 
                v4 = mask;

-               v4->s_addr = htonl(~((1 << (32 - abs(bits))) - 1));
+               v4->s_addr = bits ? htonl(~((1 << (32 - abs(bits))) - 1)) : 0;

 
                if (bits < 0)
                        v4->s_addr = ~v4->s_addr;
 
                if (bits < 0)
                        v4->s_addr = ~v4->s_addr;