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

Commit a6b4d7bb authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['ag/20428948', 'ag/20657353', 'ag/20657354'] into tm-qpr1-release. 

Change-Id: I877d6b5458f2fd4cc3402516fa6aa7c1d2df5f09
parents 29be605a a54676ac

android/app/src/com/android/bluetooth/opp/BluetoothOppUtility.java

+2 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import java.util.HashMap; 
import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.concurrent.ConcurrentHashMap;



/**
@@ -83,7 +84,7 @@ public class BluetoothOppUtility { 
                && !uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority())) {

            EventLog.writeEvent(0x534e4554, "225880741", -1, "");

        }

        return uri.getAuthority().equals(BluetoothShare.CONTENT_URI.getAuthority());

        return Objects.equals(uri.getAuthority(), BluetoothShare.CONTENT_URI.getAuthority());

    }



    public static BluetoothOppTransferInfo queryRecord(Context context, Uri uri) {

system/stack/avdt/avdt_scb_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ void avdt_scb_hdl_pkt_no_frag(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { 
    p += ex_len * 4;

  }



  if ((p - p_start) > len) {

  if ((p - p_start) >= len) {

    android_errorWriteLog(0x534e4554, "142546355");

    osi_free_and_reset((void**)&p_data->p_pkt);

    return;
@@ -272,11 +272,11 @@ void avdt_scb_hdl_pkt_no_frag(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { 
  /* adjust length for any padding at end of packet */

  if (o_p) {

    /* padding length in last byte of packet */

    pad_len = *(p_start + len);

    pad_len = *(p_start + len - 1);

  }



  /* do sanity check */

  if (pad_len > (len - offset)) {

  if (pad_len >= (len - offset)) {

    AVDT_TRACE_WARNING("Got bad media packet");

    osi_free_and_reset((void**)&p_data->p_pkt);

  }

system/stack/test/stack_avdtp_test.cc

+141 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


//#include <dlfcn.h>

#include <gtest/gtest.h>

#include <sys/types.h>



#include <cstdint>

#include <cstring>



#include "osi/include/allocator.h"

#include "stack/avdt/avdt_int.h"
@@ -315,3 +319,140 @@ TEST_F(StackAvdtpTest, test_SDES_reporting_handler) { 
  avdt_scb_hdl_pkt(pscb, &data);

  ASSERT_EQ(mock_function_count_map["AvdtReportCallback"], 1);

}



void avdt_scb_hdl_pkt_no_frag(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data);

// regression tests for b/258057241 (CVE-2022-40503)

// The regression tests are divided into 2 tests:

// avdt_scb_hdl_pkt_no_frag_regression_test1 verifies that

// OOB access resulted from integer overflow

// from the ex_len field in the packet is properly handled



TEST_F(StackAvdtpTest, avdt_scb_hdl_pkt_no_frag_regression_test0) {

  const uint16_t extra_size = 0;

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + extra_size);

  ASSERT_NE(p_pkt, nullptr);

  tAVDT_SCB_EVT evt_data = {

      .p_pkt = p_pkt,

  };

  p_pkt->len = 0;



  // get the stream control block

  AvdtpScb* pscb = avdt_scb_by_hdl(scb_handle_);

  ASSERT_NE(pscb, nullptr);



  // any memory issue would be caught be the address sanitizer

  avdt_scb_hdl_pkt_no_frag(pscb, &evt_data);



  // here we would also assume that p_pkt would have been freed

  // by avdt_scb_hdl_pkt_no_frag by calling osi_free_and_reset

  // thus vt_data.p_pkt will be set to nullptr

  ASSERT_EQ(evt_data.p_pkt, nullptr);

}



TEST_F(StackAvdtpTest, avdt_scb_hdl_pkt_no_frag_regression_test1) {

  const uint16_t extra_size = 100;

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + extra_size);

  ASSERT_NE(p_pkt, nullptr);

  tAVDT_SCB_EVT evt_data = {

      .p_pkt = p_pkt,

  };



  // setup p_pkt

  // no overflow here

  p_pkt->len = extra_size;

  p_pkt->offset = 0;



  uint8_t* p = (uint8_t*)(p_pkt + 1);

  // fill the p_pkt with 0xff to

  // make ex_len * 4 overflow

  memset(p, 0xff, extra_size);



  // get the stream control block

  AvdtpScb* pscb = avdt_scb_by_hdl(scb_handle_);

  ASSERT_NE(pscb, nullptr);



  // any memory issue would be caught be the address sanitizer

  avdt_scb_hdl_pkt_no_frag(pscb, &evt_data);



  // here we would also assume that p_pkt would have been freed

  // by avdt_scb_hdl_pkt_no_frag by calling osi_free_and_reset

  // thus vt_data.p_pkt will be set to nullptr

  ASSERT_EQ(evt_data.p_pkt, nullptr);

}



// avdt_scb_hdl_pkt_no_frag_regression_test2 verifies that

// OOB access resulted from integer overflow

// from the pad_len field in the packet is properly handled

TEST_F(StackAvdtpTest, avdt_scb_hdl_pkt_no_frag_regression_test2) {

  const uint16_t extra_size = 100;

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + extra_size);

  ASSERT_NE(p_pkt, nullptr);

  tAVDT_SCB_EVT evt_data = {

      .p_pkt = p_pkt,

  };



  // setup p_pkt

  // no overflow here

  p_pkt->len = extra_size;

  p_pkt->offset = 0;



  uint8_t* p = (uint8_t*)(p_pkt + 1);

  // zero out all bytes first

  memset(p, 0, extra_size);

  // setup o_v, o_p, o_x, o_cc

  *p = 0xff;

  // set the pad_len to be 0xff

  p[extra_size - 1] = 0xff;



  // get the stream control block

  AvdtpScb* pscb = avdt_scb_by_hdl(scb_handle_);

  ASSERT_NE(pscb, nullptr);



  // any memory issue would be caught be the address sanitizer

  avdt_scb_hdl_pkt_no_frag(pscb, &evt_data);



  // here we would also assume that p_pkt would have been freed

  // by avdt_scb_hdl_pkt_no_frag by calling osi_free_and_reset

  // thus vt_data.p_pkt will be set to nullptr

  ASSERT_EQ(evt_data.p_pkt, nullptr);

}



// avdt_scb_hdl_pkt_no_frag_regression_test3 verifies that

// zero length packets are filtered out

TEST_F(StackAvdtpTest, avdt_scb_hdl_pkt_no_frag_regression_test3) {

  // 12 btyes of minimal + 15 * oc (4 bytes each) + 4 btye to ex_len

  const uint16_t extra_size = 12 + 15 * 4 + 4;

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + extra_size);

  ASSERT_NE(p_pkt, nullptr);

  tAVDT_SCB_EVT evt_data = {

      .p_pkt = p_pkt,

  };



  // setup p_pkt

  // no overflow here

  p_pkt->len = extra_size;

  p_pkt->offset = 0;



  uint8_t* p = (uint8_t*)(p_pkt + 1);

  // fill the p_pkt with 0 to

  // make ex_len * 4 overflow

  memset(p, 0, extra_size);

  // setup

  // o_v = 0b10

  // o_p = 0b01 // with padding

  // o_x = 0b10

  // o_cc = 0b1111

  *p = 0xff;



  // get the stream control block

  AvdtpScb* pscb = avdt_scb_by_hdl(scb_handle_);

  ASSERT_NE(pscb, nullptr);



  // any memory issue would be caught be the address sanitizer

  avdt_scb_hdl_pkt_no_frag(pscb, &evt_data);



  // here we would also assume that p_pkt would have been freed

  // by avdt_scb_hdl_pkt_no_frag by calling osi_free_and_reset

  // thus vt_data.p_pkt will be set to nullptr

  ASSERT_EQ(evt_data.p_pkt, nullptr);

}