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

Commit 29299742 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

libnetutils: Check socket() return value 

Add a check for socket() errors and make sure to preserve errno over the
subsequent close() calls.

Change-Id: If52d76cd3cb45044eaaf7fea9bfd4471dc66a078
parent 0f0498ad

libnetutils/ifc_utils.c

+9 −2
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ int ifc_act_on_address(int action, const char *name, const char *address, 
                       int prefixlen) {

    int ifindex, s, len, ret;

    struct sockaddr_storage ss;

    int saved_errno;

    void *addr;

    size_t addrlen;

    struct {
@@ -317,15 +318,21 @@ int ifc_act_on_address(int action, const char *name, const char *address, 
    memcpy(RTA_DATA(rta), addr, addrlen);



    s = socket(PF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);

    if (s < 0) {

        return -errno;

    }



    if (send(s, &req, req.n.nlmsg_len, 0) < 0) {

        saved_errno = errno;

        close(s);

        return -errno;

        return -saved_errno;

    }



    len = recv(s, buf, sizeof(buf), 0);

    saved_errno = errno;

    close(s);

    if (len < 0) {

        return -errno;

        return -saved_errno;

    }



    // Parse the acknowledgement to find the return code.