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

Commit 027fb91a authored by Akshata Kadam's avatar Akshata Kadam Committed by Devendra Singhi
Browse files

Added libmtp_fuzz 

This CL creates the libmtp_fuzz library with the MTP_FUZZER flag.
If the macro is defined, the USB device uses input-output files
created by the fuzzer to pass the icotl call.

Test: make libmtp_fuzz
Bug: 234679864

Change-Id: I3d857caf38e75ef2dba49d9deb7674be9d0347ef
parent 512f3a03

media/mtp/Android.bp

+13 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ license { 
    ],

}



cc_library_shared {

    name: "libmtp",

cc_defaults {

    name: "libmtp_defaults",

    srcs: [

        "MtpDataPacket.cpp",

        "MtpDebug.cpp",
@@ -71,3 +71,14 @@ cc_library_shared { 
    ],

    header_libs: ["libcutils_headers"],

}



cc_library_shared {

    name: "libmtp",

    defaults: ["libmtp_defaults"],

}



cc_library_shared {

    name: "libmtp_fuzz",

    defaults: ["libmtp_defaults"],

    cflags: ["-DMTP_FUZZER"],

}

media/mtp/MtpDescriptors.h

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,17 @@ 


namespace android {



#ifdef MTP_FUZZER

constexpr char FFS_MTP_EP0[] = "/data/local/tmp/usb-ffs/mtp/ep0";

constexpr char FFS_MTP_EP_IN[] = "/data/local/tmp/usb-ffs/mtp/ep1";

constexpr char FFS_MTP_EP_OUT[] = "/data/local/tmp/usb-ffs/mtp/ep2";

constexpr char FFS_MTP_EP_INTR[] = "/data/local/tmp/usb-ffs/mtp/ep3";



constexpr char FFS_PTP_EP0[] = "/data/local/tmp/usb-ffs/ptp/ep0";

constexpr char FFS_PTP_EP_IN[] = "/data/local/tmp/usb-ffs/ptp/ep1";

constexpr char FFS_PTP_EP_OUT[] = "/data/local/tmp/usb-ffs/ptp/ep2";

constexpr char FFS_PTP_EP_INTR[] = "/data/local/tmp/usb-ffs/ptp/ep3";

#else

constexpr char FFS_MTP_EP0[] = "/dev/usb-ffs/mtp/ep0";

constexpr char FFS_MTP_EP_IN[] = "/dev/usb-ffs/mtp/ep1";

constexpr char FFS_MTP_EP_OUT[] = "/dev/usb-ffs/mtp/ep2";
@@ -32,6 +43,7 @@ constexpr char FFS_PTP_EP0[] = "/dev/usb-ffs/ptp/ep0"; 
constexpr char FFS_PTP_EP_IN[] = "/dev/usb-ffs/ptp/ep1";

constexpr char FFS_PTP_EP_OUT[] = "/dev/usb-ffs/ptp/ep2";

constexpr char FFS_PTP_EP_INTR[] = "/dev/usb-ffs/ptp/ep3";

#endif



constexpr int MAX_PACKET_SIZE_FS = 64;

constexpr int MAX_PACKET_SIZE_HS = 512;