diff mbox series

[BlueZ] shared/att: Don't keep retrying the same operation

Message ID 20231003184222.3273301-1-luiz.dentz@gmail.com (mailing list archive)
State Accepted
Commit 7ff68ce57fb4475f259cf5a7453cbd3cb9b8a5bd
Headers show
Series [BlueZ] shared/att: Don't keep retrying the same operation | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Luiz Augusto von Dentz Oct. 3, 2023, 6:42 p.m. UTC
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

If an operation has been retried already don't attempt to change the
security again.
---
 src/shared/att.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

bluez.test.bot@gmail.com Oct. 3, 2023, 8:21 p.m. UTC | #1
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=789685

---Test result---

Test Summary:
CheckPatch                    PASS      0.39 seconds
GitLint                       PASS      0.26 seconds
BuildEll                      PASS      33.91 seconds
BluezMake                     PASS      993.14 seconds
MakeCheck                     PASS      13.66 seconds
MakeDistcheck                 PASS      191.90 seconds
CheckValgrind                 PASS      308.54 seconds
CheckSmatch                   PASS      414.86 seconds
bluezmakeextell               PASS      127.84 seconds
IncrementalBuild              PASS      811.02 seconds
ScanBuild                     PASS      1271.64 seconds



---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org Oct. 3, 2023, 11:20 p.m. UTC | #2
Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Tue,  3 Oct 2023 11:42:22 -0700 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> If an operation has been retried already don't attempt to change the
> security again.
> ---
>  src/shared/att.c | 8 ++++++++
>  1 file changed, 8 insertions(+)

Here is the summary with links:
  - [BlueZ] shared/att: Don't keep retrying the same operation
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=7ff68ce57fb4

You are awesome, thank you!
diff mbox series

Patch

diff --git a/src/shared/att.c b/src/shared/att.c
index 85feead77d0f..62c884b65721 100644
--- a/src/shared/att.c
+++ b/src/shared/att.c
@@ -193,6 +193,7 @@  struct att_send_op {
 	uint8_t opcode;
 	void *pdu;
 	uint16_t len;
+	bool retry;
 	bt_att_response_func_t callback;
 	bt_att_destroy_func_t destroy;
 	void *user_data;
@@ -785,6 +786,12 @@  static bool handle_error_rsp(struct bt_att_chan *chan, uint8_t *pdu,
 
 	*opcode = rsp->opcode;
 
+	/* If operation has already been marked as retry don't attempt to change
+	 * the security again.
+	 */
+	if (op->retry)
+		return false;
+
 	/* Attempt to change security */
 	if (!change_security(chan, rsp->ecode))
 		return false;
@@ -798,6 +805,7 @@  static bool handle_error_rsp(struct bt_att_chan *chan, uint8_t *pdu,
 	DBG(att, "(chan %p) Retrying operation %p", chan, op);
 
 	chan->pending_req = NULL;
+	op->retry = true;
 
 	/* Push operation back to channel queue */
 	return queue_push_head(chan->queue, op);