Checkign in new iproute2

[iproute2.git] / ip / ipmaddr.c

diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index 1cdab0b..44ffdfc 100644 (file)
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -43,11 +43,11 @@ static void usage(void)
        exit(-1);
 }
 
-static int parse_hex(char *str, unsigned char *addr)
+static int parse_hex(char *str, unsigned char *addr, size_t size)
 {
        int len=0;
 
-       while (*str) {
+       while (*str && (len < 2 * size)) {
                int tmp;
                if (str[1] == 0)
                        return -1;
@@ -104,7 +104,7 @@ void read_dev_mcast(struct ma_info **result_p)
 
                m.addr.family = AF_PACKET;
 
-               len = parse_hex(hexa, (unsigned char*)&m.addr.data);
+               len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data));
                if (len >= 0) {
                        struct ma_info *ma = malloc(sizeof(m));
 
@@ -176,7 +176,7 @@ void read_igmp6(struct ma_info **result_p)
 
                m.addr.family = AF_INET6;
 
-               len = parse_hex(hexa, (unsigned char*)&m.addr.data);
+               len = parse_hex(hexa, (unsigned char*)&m.addr.data, sizeof (m.addr.data));
                if (len >= 0) {
                        struct ma_info *ma = malloc(sizeof(m));
 
@@ -212,7 +212,7 @@ static void print_maddr(FILE *fp, struct ma_info *list)
                        fprintf(fp, "family %d ", list->addr.family);
                        break;
                }
-               fprintf(fp, "%s", 
+               fprintf(fp, "%s",
                        format_host(list->addr.family,
                                    -1,
                                    list->addr.data,
@@ -298,7 +298,8 @@ int multiaddr_modify(int cmd, int argc, char **argv)
                                usage();
                        if (ifr.ifr_hwaddr.sa_data[0])
                                duparg("address", *argv);
-                       if (ll_addr_a2n(ifr.ifr_hwaddr.sa_data, 14, *argv) < 0) {
+                       if (ll_addr_a2n(ifr.ifr_hwaddr.sa_data,
+                                       14, *argv) < 0) {
                                fprintf(stderr, "Error: \"%s\" is not a legal ll address.\n", *argv);
                                exit(1);
                        }