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

Commit bef09aaf authored by Tianjie Xu's avatar Tianjie Xu
Browse files

DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket 

Go through the code that opens socket in marshmallow, and backport the
SOCK_CLOEXEC usage when opening sockets with AF_NETLINK.
Bug: 31242981
Test: mma

Change-Id: I709fc1dd43a883f95bb99021e1350c062ca35203
parent 61f27551

libcutils/uevent.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ int uevent_open_socket(int buf_sz, bool passcred) 
    addr.nl_pid = getpid();

    addr.nl_groups = 0xffffffff;



    s = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);

    s = socket(PF_NETLINK, SOCK_DGRAM | SOCK_CLOEXEC, NETLINK_KOBJECT_UEVENT);

    if(s < 0)

        return -1;

libnetutils/ifc_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ int ifc_act_on_address(int action, const char *name, const char *address, 
    req.n.nlmsg_len = NLMSG_ALIGN(req.n.nlmsg_len) + RTA_LENGTH(addrlen);

    memcpy(RTA_DATA(rta), addr, addrlen);



    s = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);

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

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

        close(s);

        return -errno;