Bluetooth: SDP: Fix the error if continuation length is not 0 #86422
Conversation
zephyrbot
added
area: Bluetooth
area: Bluetooth Classic
zephyrbot
requested review from
gzh-terry,
jhedberg,
makeshi and
MarkWangChinese
| frame_len -= sdp_client_get_total(session, buf, &total); | ||
| if (frame_len != total) { |
There was a problem hiding this comment.
Based on your description, shouldn't this test be (total != 0 && frame_len != total)?
There was a problem hiding this comment.
I think only valid condition could be (total != 0 && frame_len > total).
There was a problem hiding this comment.
I think only valid condition could be
(total != 0 && frame_len > total).
This looks reasonable.
There was a problem hiding this comment.
But I think the condition has not much effect for the entire response. It can only avoid the first frame of response is not valid.
So I think we need to keep the total len in the duration of the response. So I plan to improve it. That is why I removed the condition.
Besides, there is another issue is the SDP discover cannot be done in some cases that the frame of the response is invalid. This is another point we can improve.
lylezhu2012
force-pushed
the
fix_sdp_invalid_attribute_lists_error
branch
from
7dcc4f4 to
c3d198b
Compare
| @@ -2053,7 +2053,7 @@ static int sdp_client_receive_ssa_sa(struct bt_sdp_client *session, struct net_b | |||
|
|
|||
| /* Get total value of all attributes to be collected */ | |||
| frame_len -= sdp_client_get_total(session, buf, &total); | |||
| if (frame_len != total) { | |||
| if (total && (frame_len > total)) { | |||
There was a problem hiding this comment.
I think it would be good to add a code comment above this, so future readers (years from now) understand why the condition is as it is.
There was a problem hiding this comment.
Sure. Updated.
When the continuation length is not 0, there is a reported error. In current implementation, the total length is only valid only when the frame is the first block of the SDP response. For following continuous frame, the total length is 0. So, change the condition to `(total != 0 && frame_len > total)`. Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>
lylezhu2012
force-pushed
the
fix_sdp_invalid_attribute_lists_error
branch
from
c3d198b to
7eaa1e8
Compare
When the continuation length is not 0, there is an reported error.
In current implementation, the total length is only valid only when the frame is the first block of the SDP response. For following continuous frame, the total length is 0.
So, change the condition to
(total != 0 && frame_len > total)