2022-10-11 13:54:29

by Isak Westin

Subject: [PATCH BlueZ v2] mesh: Keep canceled SAR data for at least 10 sec

When a SAR transmission has been completed or canceled, the recipent
should store the block authentication values for at least 10 seconds
and ignore new segments with the same values during this period. See
MshPRFv1.0.1 section 3.5.3.4.
---
mesh/net.c | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/mesh/net.c b/mesh/net.c
index 3f42d962c..cbac0e02c 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -46,6 +46,7 @@

#define SEG_TO 2
#define MSG_TO 60
+#define SAR_DEL 10

#define DEFAULT_TRANSMIT_COUNT 1
#define DEFAULT_TRANSMIT_INTERVAL 100
@@ -166,6 +167,7 @@ struct mesh_sar {
bool segmented;
bool frnd;
bool frnd_cred;
+ bool delete;
uint8_t ttl;
uint8_t last_seg;
uint8_t key_aid;
@@ -1492,14 +1494,27 @@ static void inseg_to(struct l_timeout *seg_timeout, void *user_data)
static void inmsg_to(struct l_timeout *msg_timeout, void *user_data)
{
struct mesh_net *net = user_data;
- struct mesh_sar *sar = l_queue_remove_if(net->sar_in,
+ struct mesh_sar *sar = l_queue_find(net->sar_in,
match_msg_timeout, msg_timeout);

- l_timeout_remove(msg_timeout);
- if (!sar)
+ if (!sar) {
+ l_timeout_remove(msg_timeout);
return;
+ }

- sar->msg_timeout = NULL;
+ if (!sar->delete) {
+ /*
+ * Incomplete timer expired, cancel SAR and start
+ * delete timer
+ */
+ l_timeout_remove(sar->seg_timeout);
+ sar->seg_timeout = NULL;
+ sar->delete = true;
+ l_timeout_modify(sar->msg_timeout, SAR_DEL);
+ return;
+ }
+
+ l_queue_remove(net->sar_in, sar);
mesh_sar_free(sar);
}

@@ -1963,7 +1978,9 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
/* Re-Send ACK for full msg */
send_net_ack(net, sar_in, expected);
return true;
- }
+ } else if (sar_in->delete)
+ /* Ignore canceled */
+ return false;
} else {
uint16_t len = MAX_SEG_TO_LEN(segN);

@@ -2013,6 +2030,10 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
/* Kill Inter-Seg timeout */
l_timeout_remove(sar_in->seg_timeout);
sar_in->seg_timeout = NULL;
+
+ /* Start delete timer */
+ sar_in->delete = true;
+ l_timeout_modify(sar_in->msg_timeout, SAR_DEL);
return true;
}

--
2.20.1

2022-10-11 14:42:51

by bluez.test.bot

Subject: RE: [BlueZ,v2] mesh: Keep canceled SAR data for at least 10 sec

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=684508

---Test result---

Test Summary:
CheckPatch PASS 1.51 seconds
GitLint PASS 1.05 seconds
Prep - Setup ELL PASS 27.23 seconds
Build - Prep PASS 0.84 seconds
Build - Configure PASS 8.57 seconds
Build - Make PASS 858.05 seconds
Make Check PASS 12.44 seconds
Make Check w/Valgrind PASS 292.22 seconds
Make Distcheck PASS 236.01 seconds
Build w/ext ELL - Configure PASS 8.85 seconds
Build w/ext ELL - Make PASS 85.34 seconds
Incremental Build w/ patches PASS 0.00 seconds
Scan Build PASS 512.73 seconds



---
Regards,
Linux Bluetooth