Bluetooth: ATT: Fix disconnected ATT not releasing buffers

joerchan · jhedberg · commit 4bca0f3d3391 · 2019-10-04T10:33:55.000+03:00
Fix bug in ATT reset handling, not releasing queued notification
buffers when the connection is terminated.

Signed-off-by: Joakim Andersson &lt;joakim.andersson@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
@@ -2054,18 +2054,18 @@ static void att_reset(struct bt_att *att)
 {
 	struct bt_att_req *req, *tmp;
 	int i;
-#if CONFIG_BT_ATT_PREPARE_COUNT > 0
 	struct net_buf *buf;
 
+#if CONFIG_BT_ATT_PREPARE_COUNT > 0
 	/* Discard queued buffers */
 	while ((buf = k_fifo_get(&att->prep_queue, K_NO_WAIT))) {
 		net_buf_unref(buf);
 	}
+#endif /* CONFIG_BT_ATT_PREPARE_COUNT > 0 */
 
 	while ((buf = k_fifo_get(&att->tx_queue, K_NO_WAIT))) {
 		net_buf_unref(buf);
 	}
-#endif
 
 	atomic_set_bit(att->flags, ATT_DISCONNECTED);
 

Original file line number	Diff line number	Diff line change
`@@ -2054,18 +2054,18 @@ static void att_reset(struct bt_att *att)`
`2054`	`2054`	`{`
`2055`	`2055`	`struct bt_att_req req, tmp;`
`2056`	`2056`	`int i;`
`2057`		`-#if CONFIG_BT_ATT_PREPARE_COUNT > 0`
`2058`	`2057`	`struct net_buf *buf;`
`2059`	`2058`
	`2059`	`+#if CONFIG_BT_ATT_PREPARE_COUNT > 0`
`2060`	`2060`	`/* Discard queued buffers */`
`2061`	`2061`	`while ((buf = k_fifo_get(&att->prep_queue, K_NO_WAIT))) {`
`2062`	`2062`	`net_buf_unref(buf);`
`2063`	`2063`	`}`
	`2064`	`+#endif /* CONFIG_BT_ATT_PREPARE_COUNT > 0 */`
`2064`	`2065`
`2065`	`2066`	`while ((buf = k_fifo_get(&att->tx_queue, K_NO_WAIT))) {`
`2066`	`2067`	`net_buf_unref(buf);`
`2067`	`2068`	`}`
`2068`		`-#endif`
`2069`	`2069`
`2070`	`2070`	`atomic_set_bit(att->flags, ATT_DISCONNECTED);`
`2071`	`2071`