Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a47c2fdd authored by San Mehat's avatar San Mehat Committed by The Android Open Source Project
Browse files

am c83cd879: init: Fix heap corruption for services with arguments 

Merge commit 'c83cd879'

* commit 'c83cd879':
  init: Fix heap corruption for services with arguments
  toolbox: ifconfig: Implement mtu setting, plus setting interface addr should
  toolbox: route: Reflow some of the mess, fix route add parameter names to
parents cb1c9ef3 c83cd879

init/init.h

+5 −3
Original line number Diff line number Diff line
@@ -137,15 +137,17 @@ struct service { 
    struct socketinfo *sockets;

    struct svcenvinfo *envvars;



    int nargs;

    char *args[1];

    struct action onrestart;  /* Actions to execute on restart. */

    

    /* keycodes for triggering this service via /dev/keychord */

    int *keycodes;

    int nkeycodes;

    int keychord_id;

};



    int nargs;

    /* "MUST BE AT THE END OF THE STRUCT" */

    char *args[1];

}; /*     ^-------'args' MUST be at the end of this struct! */



int parse_config_file(const char *fn);

toolbox/ifconfig.c

+40 −32
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ static inline void init_sockaddr_in(struct sockaddr_in *sin, const char *addr) 
    sin->sin_addr.s_addr = inet_addr(addr);

}



static void setmtu(int s, struct ifreq *ifr, const char *mtu)

{

    int m = atoi(mtu);

    ifr->ifr_mtu = m;

    if(ioctl(s, SIOCSIFMTU, ifr) < 0) die("SIOCSIFMTU");

}

static void setdstaddr(int s, struct ifreq *ifr, const char *addr)

{

    init_sockaddr_in((struct sockaddr_in *) &ifr->ifr_dstaddr, addr);
@@ -115,22 +121,24 @@ int ifconfig_main(int argc, char *argv[]) 
        running = (flags & IFF_RUNNING)      ? " running" : "";

        multi =   (flags & IFF_MULTICAST)    ? " multicast" : "";

        printf("%s%s%s%s%s%s]\n", updown, brdcst, loopbk, ppp, running, multi);







/*    char *updown, *brdcst, *loopbk, *ppp, *running, *multi; */



        return 0;

    }

    

    while(argc > 0) {

        if (!strcmp(argv[0], "up")) {

            setflags(s, &ifr, IFF_UP, 0);

        } else if (!strcmp(argv[0], "mtu")) {

            argc--, argv++;

            if (!argc) {

                errno = EINVAL;

                die("expecting a value for parameter \"mtu\"");

            }

            setmtu(s, &ifr, argv[0]);

        } else if (!strcmp(argv[0], "-pointopoint")) {

            setflags(s, &ifr, IFF_POINTOPOINT, 1);

        } else if (!strcmp(argv[0], "pointopoint")) {

            argc--, argv++;

		if (0 == argc) { 

            if (!argc) { 

                errno = EINVAL;

                die("expecting an IP address for parameter \"pointtopoint\"");

            }
@@ -140,16 +148,16 @@ int ifconfig_main(int argc, char *argv[]) 
            setflags(s, &ifr, 0, IFF_UP);

        } else if (!strcmp(argv[0], "netmask")) {

            argc--, argv++;

			if (0 == argc) { 

            if (!argc) { 

                errno = EINVAL;

                die("expecting an IP address for parameter \"netmask\"");

            }

            setnetmask(s, &ifr, argv[0]);

        } else if (isdigit(argv[0][0])) {

            setaddr(s, &ifr, argv[0]);

            setflags(s, &ifr, IFF_UP, 0);

        }

        argc--, argv++;

    }



    return 0;

}

toolbox/route.c

+62 −58
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ int route_main(int argc, char *argv[]) 
    struct rtentry rt;

    struct sockaddr_in ina;

   

    if(argc == 0) return 0;

    if (!argc)

        return 0;



    strncpy(ifr.ifr_name, argv[0], IFNAMSIZ);

    ifr.ifr_name[IFNAMSIZ-1] = 0;
@@ -75,7 +76,8 @@ int route_main(int argc, char *argv[]) 
                    EXPECT_NEXT(argc, argv);

                    rt.rt_flags = RTF_UP | RTF_HOST;

                    rt.rt_dev = argv[0];

				  if (ioctl(s, SIOCADDRT, &rt) < 0) die("SIOCADDRT\n");

                    if (ioctl(s, SIOCADDRT, &rt) < 0)

                        die("SIOCADDRT\n");

                } else if (!strcmp(argv[0], "gw")) {

                    EXPECT_NEXT(argc, argv);

                    rt.rt_flags = RTF_UP | RTF_GATEWAY;
@@ -95,7 +97,7 @@ int route_main(int argc, char *argv[]) 
                    }

                }

            } else {

                          char keywords[3][5] = { "net", "mask", "gw" };

                char keywords[3][10] = { "-net", "netmask", "gw" };

                struct sockaddr_in *paddr[3] = { &rt.rt_dst, &rt.rt_genmask, &rt.rt_gateway };

                int k = 0;
@@ -109,11 +111,13 @@ int route_main(int argc, char *argv[]) 
                         } else {

                            die("expecting an IP/MASK address for parameter %s\n", keywords[k]);

                         }

                              if(k < 2) EXPECT_NEXT(argc, argv);

                     if (k < 2)

                         EXPECT_NEXT(argc, argv);

                     } else {

                         die("expecting keyword(s)\n");

                     }

                 } while (++k < 3);



                if (ioctl(s, SIOCADDRT, &rt) < 0) {

                    die("SIOCADDRT\n");

                }