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

Commit 1b93f38e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: abort on Parcel::appendFrom in no-kernel mode" am:... 

Merge "libbinder: abort on Parcel::appendFrom in no-kernel mode" am: ec0d68e9 am: 13d90b93 am: db0c9ad0

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2147342



Change-Id: I60fd10ffba6f4ecc7e4fa6ba03d24edd95bb2f0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8de48c6 db0c9ad0

libs/binder/Parcel.cpp

+5 −2
Original line number Diff line number Diff line
@@ -503,8 +503,8 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 


    err = NO_ERROR;



#ifdef BINDER_WITH_KERNEL_IPC

    if (auto* kernelFields = maybeKernelFields()) {

#ifdef BINDER_WITH_KERNEL_IPC

        auto* otherKernelFields = parcel->maybeKernelFields();

        LOG_ALWAYS_FATAL_IF(otherKernelFields == nullptr);
@@ -564,6 +564,10 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
                }

            }

        }

#else

        LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");

        return INVALID_OPERATION;

#endif // BINDER_WITH_KERNEL_IPC

    } else {

        auto* rpcFields = maybeRpcFields();

        LOG_ALWAYS_FATAL_IF(rpcFields == nullptr);
@@ -622,7 +626,6 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
            }

        }

    }

#endif // BINDER_WITH_KERNEL_IPC



    return err;

}