michaelh/zephyr
1
0
Fork 0
Code Releases Activity

style: tests: comply with MISRA C:2012 Rule 15.6

Browse source 
Add missing braces to comply with MISRA C:2012 Rule 15.6 and
also following Zephyr's style guideline.

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
This commit is contained in:
Pisit Sawangvonganan 2024-08-21 04:02:14 +07:00 • committed by Anas Nashif
commit 442a0686fc
26 changed files with 287 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_1.c
View file

@ -152,10 +152,12 @@ static ssize_t write_value_v2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_value))
if (offset >= sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_value))
}
if (offset + len > sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -182,10 +184,12 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_1_value))
if (offset >= sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_1_value))
}
if (offset + len > sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -211,10 +215,12 @@ static ssize_t write_value_v3(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v3_value))
if (offset >= sizeof(value_v3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v3_value))
}
if (offset + len > sizeof(value_v3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

12
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_2.c
View file

@ -111,10 +111,12 @@ static ssize_t write_value_v2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_value))
if (offset >= sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_value))
}
if (offset + len > sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -140,10 +142,12 @@ static ssize_t write_value_v3(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v3_value))
if (offset >= sizeof(value_v3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v3_value))
}
if (offset + len > sizeof(value_v3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

12
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_a_3.c
View file

@ -111,10 +111,12 @@ static ssize_t write_value_v2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_value))
if (offset >= sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_value))
}
if (offset + len > sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -140,10 +142,12 @@ static ssize_t write_value_v3(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v3_value))
if (offset >= sizeof(value_v3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v3_value))
}
if (offset + len > sizeof(value_v3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

18
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_1.c
View file

@ -95,10 +95,12 @@ static ssize_t write_value_v4(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v4_value))
if (offset >= sizeof(value_v4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v4_value))
}
if (offset + len > sizeof(value_v4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -147,10 +149,12 @@ static ssize_t write_value_v4_1(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v4_1_value))
if (offset >= sizeof(value_v4_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v4_1_value))
}
if (offset + len > sizeof(value_v4_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -204,10 +208,12 @@ static ssize_t write_server_cha_con(struct bt_conn *conn,
uint16_t *value = attr->user_data;
uint16_t server_cha_con_conv = sys_cpu_to_le16(*value);
if (offset >= sizeof(server_cha_con_value))
if (offset >= sizeof(server_cha_con_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(server_cha_con_value))
}
if (offset + len > sizeof(server_cha_con_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy((uint8_t *)&server_cha_con_conv + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_2.c
View file

@ -69,10 +69,12 @@ static ssize_t write_value_v4(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v4_value))
if (offset >= sizeof(value_v4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v4_value))
}
if (offset + len > sizeof(value_v4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_1_3.c
View file

@ -69,10 +69,12 @@ static ssize_t write_value_v4(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v4_value))
if (offset >= sizeof(value_v4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v4_value))
}
if (offset + len > sizeof(value_v4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

9
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_1.c
View file

@ -87,12 +87,15 @@ static ssize_t write_value_v5(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v5_value))
if (offset >= sizeof(value_v5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v5_value))
}
if (offset + len > sizeof(value_v5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
if (!bAuthorized)
}
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_2.c
View file

@ -86,10 +86,12 @@ static ssize_t write_value_v5(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v5_value))
if (offset >= sizeof(value_v5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v5_value))
}
if (offset + len > sizeof(value_v5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_2_3.c
View file

@ -86,10 +86,12 @@ static ssize_t write_value_v5(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v5_value))
if (offset >= sizeof(value_v5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v5_value))
}
if (offset + len > sizeof(value_v5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_1.c
View file

@ -70,10 +70,12 @@ static ssize_t write_value_v6(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v6_value))
if (offset >= sizeof(value_v6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v6_value))
}
if (offset + len > sizeof(value_v6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_3_2.c
View file

@ -72,10 +72,12 @@ static ssize_t write_value_v6(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v6_value))
if (offset >= sizeof(value_v6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v6_value))
}
if (offset + len > sizeof(value_v6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_1.c
View file

@ -47,10 +47,12 @@ static ssize_t write_value_v7(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v7_value))
if (offset >= sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v7_value))
}
if (offset + len > sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_2.c
View file

@ -47,10 +47,12 @@ static ssize_t write_value_v7(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v7_value))
if (offset >= sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v7_value))
}
if (offset + len > sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

6
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_4_3.c
View file

@ -47,10 +47,12 @@ static ssize_t write_value_v7(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v7_value))
if (offset >= sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v7_value))
}
if (offset + len > sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

30
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_b_5_1.c
View file

@ -88,10 +88,12 @@ static ssize_t write_value_v8(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v8_value))
if (offset >= sizeof(value_v8_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v8_value))
}
if (offset + len > sizeof(value_v8_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -139,10 +141,12 @@ static ssize_t write_des_v8d1(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v8d1_value))
if (offset >= sizeof(des_v8d1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v8d1_value))
}
if (offset + len > sizeof(des_v8d1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -167,8 +171,9 @@ static ssize_t read_des_v8d2(struct bt_conn *conn,
{
const uint8_t *value = attr->user_data;
if (!bAuthorized)
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
sizeof(des_v8d2_value));
@ -193,12 +198,15 @@ static ssize_t write_des_v8d2(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v8d2_value))
if (offset >= sizeof(des_v8d2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v8d2_value))
}
if (offset + len > sizeof(des_v8d2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
if (!bAuthorized)
}
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
memcpy(value + offset, buf, len);
@ -246,10 +254,12 @@ static ssize_t write_des_v8d3(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v8d3_value))
if (offset >= sizeof(des_v8d3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v8d3_value))
}
if (offset + len > sizeof(des_v8d3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

18
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_1.c
View file

@ -93,10 +93,12 @@ static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v9__128_bit_uuid_value))
if (offset >= sizeof(value_v9__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v9__128_bit_uuid_value))
}
if (offset + len > sizeof(value_v9__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -147,10 +149,12 @@ static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v9d2__128_bit_uuid_value))
if (offset >= sizeof(des_v9d2__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v9d2__128_bit_uuid_value))
}
if (offset + len > sizeof(des_v9d2__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -178,10 +182,12 @@ static ssize_t write_des_v9d3__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v9d3__128_bit_uuid_value))
if (offset >= sizeof(des_v9d3__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v9d3__128_bit_uuid_value))
}
if (offset + len > sizeof(des_v9d3__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

18
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_2.c
View file

@ -93,10 +93,12 @@ static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v9__128_bit_uuid_value))
if (offset >= sizeof(value_v9__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v9__128_bit_uuid_value))
}
if (offset + len > sizeof(value_v9__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -147,10 +149,12 @@ static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v9d2__128_bit_uuid_value))
if (offset >= sizeof(des_v9d2__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v9d2__128_bit_uuid_value))
}
if (offset + len > sizeof(des_v9d2__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -178,10 +182,12 @@ static ssize_t write_des_v9d3__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v9d3__128_bit_uuid_value))
if (offset >= sizeof(des_v9d3__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v9d3__128_bit_uuid_value))
}
if (offset + len > sizeof(des_v9d3__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

18
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_1_3.c
View file

@ -91,10 +91,12 @@ static ssize_t write_value_v9__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v9__128_bit_uuid_value))
if (offset >= sizeof(value_v9__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v9__128_bit_uuid_value))
}
if (offset + len > sizeof(value_v9__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -145,10 +147,12 @@ static ssize_t write_des_v9d2__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v9d2__128_bit_uuid_value))
if (offset >= sizeof(des_v9d2__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v9d2__128_bit_uuid_value))
}
if (offset + len > sizeof(des_v9d2__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -176,10 +180,12 @@ static ssize_t write_des_v9d3__128_bit_uuid(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(des_v9d3__128_bit_uuid_value))
if (offset >= sizeof(des_v9d3__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(des_v9d3__128_bit_uuid_value))
}
if (offset + len > sizeof(des_v9d3__128_bit_uuid_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

120
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_1.c
View file

@ -214,10 +214,12 @@ static ssize_t write_value_v2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_value))
if (offset >= sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_value))
}
if (offset + len > sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -266,10 +268,12 @@ static ssize_t write_long_des_v2d1(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d1_value))
if (offset >= sizeof(long_des_v2d1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d1_value))
}
if (offset + len > sizeof(long_des_v2d1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -296,10 +300,12 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_1_value))
if (offset >= sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_1_value))
}
if (offset + len > sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -348,10 +354,12 @@ static ssize_t write_long_des_v2d2(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d2_value))
if (offset >= sizeof(long_des_v2d2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d2_value))
}
if (offset + len > sizeof(long_des_v2d2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -378,10 +386,12 @@ static ssize_t write_value_v2_2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_2_value))
if (offset >= sizeof(value_v2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_2_value))
}
if (offset + len > sizeof(value_v2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -430,10 +440,12 @@ static ssize_t write_long_des_v2d3(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d3_value))
if (offset >= sizeof(long_des_v2d3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d3_value))
}
if (offset + len > sizeof(long_des_v2d3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -482,10 +494,12 @@ static ssize_t write_value_v2_3(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v2_3_value))
if (offset >= sizeof(value_v2_3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_3_value))
}
if (offset + len > sizeof(value_v2_3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -534,10 +548,12 @@ static ssize_t write_long_des_v2d1_1(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d1_1_value))
if (offset >= sizeof(long_des_v2d1_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d1_1_value))
}
if (offset + len > sizeof(long_des_v2d1_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -586,10 +602,12 @@ static ssize_t write_value_v2_4(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v2_4_value))
if (offset >= sizeof(value_v2_4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_4_value))
}
if (offset + len > sizeof(value_v2_4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -638,10 +656,12 @@ static ssize_t write_long_des_v2d2_1(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d2_1_value))
if (offset >= sizeof(long_des_v2d2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d2_1_value))
}
if (offset + len > sizeof(long_des_v2d2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -690,10 +710,12 @@ static ssize_t write_value_v2_5(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v2_5_value))
if (offset >= sizeof(value_v2_5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_5_value))
}
if (offset + len > sizeof(value_v2_5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -742,10 +764,12 @@ static ssize_t write_long_des_v2d3_1(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d3_1_value))
if (offset >= sizeof(long_des_v2d3_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d3_1_value))
}
if (offset + len > sizeof(long_des_v2d3_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -772,10 +796,12 @@ static ssize_t write_value_v2_6(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_6_value))
if (offset >= sizeof(value_v2_6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_6_value))
}
if (offset + len > sizeof(value_v2_6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -824,10 +850,12 @@ static ssize_t write_long_des_v2d1_2(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d1_2_value))
if (offset >= sizeof(long_des_v2d1_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d1_2_value))
}
if (offset + len > sizeof(long_des_v2d1_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -852,8 +880,9 @@ static ssize_t read_str_auth_value(struct bt_conn *conn,
{
const char *value = attr->user_data;
if (!bAuthorized)
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
strlen(value));
}
@ -878,12 +907,15 @@ static ssize_t write_value_v2_7(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_7_value))
if (offset >= sizeof(value_v2_7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_7_value))
}
if (offset + len > sizeof(value_v2_7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
if (!bAuthorized)
}
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
memcpy(value + offset, buf, len);
@ -908,8 +940,9 @@ static ssize_t read_long_des_v2d2_2(struct bt_conn *conn,
{
const uint8_t *value = attr->user_data;
if (!bAuthorized)
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
sizeof(long_des_v2d2_2_value));
@ -935,12 +968,15 @@ static ssize_t write_long_des_v2d2_2(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d2_2_value))
if (offset >= sizeof(long_des_v2d2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d2_2_value))
}
if (offset + len > sizeof(long_des_v2d2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
if (!bAuthorized)
}
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
memcpy(value + offset, buf, len);
@ -967,10 +1003,12 @@ static ssize_t write_value_v2_8(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_8_value))
if (offset >= sizeof(value_v2_8_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_8_value))
}
if (offset + len > sizeof(value_v2_8_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -1019,10 +1057,12 @@ static ssize_t write_long_des_v2d3_2(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(long_des_v2d3_2_value))
if (offset >= sizeof(long_des_v2d3_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(long_des_v2d3_2_value))
}
if (offset + len > sizeof(long_des_v2d3_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

36
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_2.c
View file

@ -128,10 +128,12 @@ static ssize_t write_value_v2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_value))
if (offset >= sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_value))
}
if (offset + len > sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -158,10 +160,12 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_1_value))
if (offset >= sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_1_value))
}
if (offset + len > sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -188,10 +192,12 @@ static ssize_t write_value_v2_2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_2_value))
if (offset >= sizeof(value_v2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_2_value))
}
if (offset + len > sizeof(value_v2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -218,10 +224,12 @@ static ssize_t write_value_v2_3(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_3_value))
if (offset >= sizeof(value_v2_3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_3_value))
}
if (offset + len > sizeof(value_v2_3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -248,10 +256,12 @@ static ssize_t write_value_v2_4(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_4_value))
if (offset >= sizeof(value_v2_4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_4_value))
}
if (offset + len > sizeof(value_v2_4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -278,10 +288,12 @@ static ssize_t write_value_v2_5(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_5_value))
if (offset >= sizeof(value_v2_5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_5_value))
}
if (offset + len > sizeof(value_v2_5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

36
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_c_2_3.c
View file

@ -128,10 +128,12 @@ static ssize_t write_value_v2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_value))
if (offset >= sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_value))
}
if (offset + len > sizeof(value_v2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -158,10 +160,12 @@ static ssize_t write_value_v2_1(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_1_value))
if (offset >= sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_1_value))
}
if (offset + len > sizeof(value_v2_1_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -188,10 +192,12 @@ static ssize_t write_value_v2_2(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_2_value))
if (offset >= sizeof(value_v2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_2_value))
}
if (offset + len > sizeof(value_v2_2_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -218,10 +224,12 @@ static ssize_t write_value_v2_3(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_3_value))
if (offset >= sizeof(value_v2_3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_3_value))
}
if (offset + len > sizeof(value_v2_3_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -248,10 +256,12 @@ static ssize_t write_value_v2_4(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_4_value))
if (offset >= sizeof(value_v2_4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_4_value))
}
if (offset + len > sizeof(value_v2_4_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -278,10 +288,12 @@ static ssize_t write_value_v2_5(struct bt_conn *conn,
{
char *value = attr->user_data;
if (offset >= sizeof(value_v2_5_value))
if (offset >= sizeof(value_v2_5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v2_5_value))
}
if (offset + len > sizeof(value_v2_5_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);

3
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_d_1.c
View file

@ -79,8 +79,9 @@ static ssize_t read_value_v11__128_bit_uuid(struct bt_conn *conn,
{
const uint8_t *value = attr->user_data;
if (!bAuthorized)
if (!bAuthorized) {
return BT_GATT_ERR(BT_ATT_ERR_AUTHORIZATION);
}
return bt_gatt_attr_read(conn, attr, buf, len, offset, value,
sizeof(value_v11__128_bit_uuid_value));

18
tests/bsim/bluetooth/ll/edtt/gatt_test_app/src/gatt/service_f_1.c
View file

@ -149,10 +149,12 @@ static ssize_t write_value_v15(struct bt_conn *conn,
{
uint8_t *value = attr->user_data;
if (offset >= sizeof(value_v15_value))
if (offset >= sizeof(value_v15_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v15_value))
}
if (offset + len > sizeof(value_v15_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy(value + offset, buf, len);
@ -202,10 +204,12 @@ static ssize_t write_value_v6(struct bt_conn *conn,
uint16_t *value = attr->user_data;
uint16_t value_v6_conv = sys_cpu_to_le16(*value);
if (offset >= sizeof(value_v6_value))
if (offset >= sizeof(value_v6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v6_value))
}
if (offset + len > sizeof(value_v6_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy((uint8_t *)&value_v6_conv + offset, buf, len);
@ -257,10 +261,12 @@ static ssize_t write_value_v7(struct bt_conn *conn,
uint32_t *value = attr->user_data;
uint32_t value_v7_conv = sys_cpu_to_le32(*value);
if (offset >= sizeof(value_v7_value))
if (offset >= sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_OFFSET);
if (offset + len > sizeof(value_v7_value))
}
if (offset + len > sizeof(value_v7_value)) {
return BT_GATT_ERR(BT_ATT_ERR_INVALID_ATTRIBUTE_LEN);
}
memcpy((uint8_t *)&value_v7_conv + offset, buf, len);

5
tests/bsim/bluetooth/ll/edtt/hci_test_app/src/main.c
View file

@ -819,10 +819,11 @@ int main(void)
edtt_read((uint8_t *)&multiple, sizeof(multiple),
EDTTT_BLOCK);
if (multiple)
if (multiple) {
get_events(--size);
else
} else {
get_event(--size);
}
}
break;
case CMD_LE_FLUSH_DATA_REQ: