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

Commit b65fbbf8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-3e56facc-2987-45a7-902e-643b62b0dad3" into cw-f-dev 

* changes:
  [automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am: 32df36d8 am: b4ed982b am: 676ae21e
  [automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am: 32df36d8 am: b4ed982b
  [automerger] DO NOT MERGE HID Host: Check L2CAP packet data length am: 32df36d8
  DO NOT MERGE HID Host: Check L2CAP packet data length
parents cfb02ae2 79ac4a15

system/stack/hid/hidh_conn.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 




#include "bt_common.h"

#include "bt_common.h"

#include "bt_types.h"

#include "bt_types.h"

#include "log/log.h"





#include "l2cdefs.h"

#include "l2cdefs.h"

#include "l2c_api.h"

#include "l2c_api.h"
@@ -820,6 +821,13 @@ static void hidh_l2cif_data_ind (UINT16 l2cap_cid, BT_HDR *p_msg) 
        return;

        return;

    }

    }





    if (p_msg->len < 1)

    {

        HIDH_TRACE_WARNING ("HID-Host Rcvd L2CAP data, invalid length");

        osi_free(p_msg);

        android_errorWriteLog(0x534e4554, "80493272");

        return;

    }





    ttype    = HID_GET_TRANS_FROM_HDR(*p_data);

    ttype    = HID_GET_TRANS_FROM_HDR(*p_data);

    param    = HID_GET_PARAM_FROM_HDR(*p_data);

    param    = HID_GET_PARAM_FROM_HDR(*p_data);