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

Commit b7947de5 authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Pass MSG_NOSIGNAL socket flags" am: d79e4f4c am: e22825a7 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687665

Change-Id: I621af5594d4c8b0b975b1662fb08cf23e4e774fa
parents 161d760f e22825a7

fs_mgr/libsnapshot/snapuserd_client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ bool SnapuserdClient::ValidateConnection() { 


bool SnapuserdClient::Sendmsg(const std::string& msg) {

    LOG(DEBUG) << "Sendmsg: msg " << msg << " sockfd: " << sockfd_;

    ssize_t numBytesSent = TEMP_FAILURE_RETRY(send(sockfd_, msg.data(), msg.size(), 0));

    ssize_t numBytesSent = TEMP_FAILURE_RETRY(send(sockfd_, msg.data(), msg.size(), MSG_NOSIGNAL));

    if (numBytesSent < 0) {

        PLOG(ERROR) << "Send failed";

        return false;

fs_mgr/libsnapshot/snapuserd_server.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ DmUserHandler::DmUserHandler(std::shared_ptr<Snapuserd> snapuserd) 
    : snapuserd_(snapuserd), misc_name_(snapuserd_->GetMiscName()) {}



bool SnapuserdServer::Sendmsg(android::base::borrowed_fd fd, const std::string& msg) {

    ssize_t ret = TEMP_FAILURE_RETRY(send(fd.get(), msg.data(), msg.size(), 0));

    ssize_t ret = TEMP_FAILURE_RETRY(send(fd.get(), msg.data(), msg.size(), MSG_NOSIGNAL));

    if (ret < 0) {

        PLOG(ERROR) << "Snapuserd:server: send() failed";

        return false;