Skip to content

Fix CYW43439 payload offsets #1095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sqt wants to merge 1 commit into
base: main
Choose a base branch
from
+39 −3
Open

Fix CYW43439 payload offsets #1095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions drivers/src/wireless/cyw43439/ioctl.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,17 @@ pub const Response = struct {
}

pub fn data(self: *Self) []const u8 {
const head: usize = self.padding() + switch (self.sdp.channel()) {
const head: usize = self.sdp.hdrlen + switch (self.sdp.channel()) {
.control => @sizeOf(CDC_Header),
.event, .data => @sizeOf(BDC_Header) + self.bdc().padding(),
};
const tail = self.sdp.len - @sizeOf(SDP_Header);
const tail = self.sdp.len;
if (head > tail) {
return &.{};
}

return self.reader.buffer[self.reader.seek..self.reader.end];
// Use the packet-relative offset, independently of cached header reads.
return self.reader.buffer[head..tail];
}

// head position and length of the data in the buffer sent to init
Expand Down Expand Up @@ -818,3 +819,38 @@ test "events mask" {
});
try testing.expectEqualSlices(u8, &buf, &mask);
}

test "response payload offset: padded WiFi event is decoded" {
const head = 22; // 14-byte SDPCM header, 4-byte BDC header, 4-byte padding
var packet: [head + @sizeOf(EventPacket)]u8 = @splat(0);
std.mem.writeInt(u16, packet[0..2], packet.len, .little);
std.mem.writeInt(u16, packet[2..4], ~@as(u16, packet.len), .little);
packet[5] = 1; // event channel
packet[7] = 14;
packet[14] = 0x20;
packet[17] = 1; // BDC padding in words
@memcpy(packet[18..22], &[_]u8{ 0, 1, 0xe7, 0 });
std.mem.writeInt(u16, packet[head + 12 ..][0..2], 0x886c, .big);
@memcpy(packet[head + 19 ..][0..3], &[_]u8{ 0, 0x10, 0x18 });
std.mem.writeInt(u32, packet[head + 28 ..][0..4], @backingInt(EventType.auth), .big);
var rsp = try Response.init(&packet);
const evt = rsp.event();
try testing.expect(evt != null);
try testing.expectEqual(EventType.auth, evt.?.msg.event_type);
try testing.expectEqualSlices(u8, packet[head..], rsp.data());
try testing.expectEqualSlices(u8, packet[head..], rsp.data());
}

test "response payload offset: control payload does not depend on reading cdc first" {
const head = @sizeOf(SDP_Header) + @sizeOf(CDC_Header);
var packet: [head + 4]u8 = @splat(0);
std.mem.writeInt(u16, packet[0..2], packet.len, .little);
std.mem.writeInt(u16, packet[2..4], ~@as(u16, packet.len), .little);
packet[7] = @sizeOf(SDP_Header);
std.mem.writeInt(u32, packet[@sizeOf(SDP_Header)..][0..4], @backingInt(Cmd.get_var), .little);
@memcpy(packet[head..], "test");
var rsp = try Response.init(&packet);
try testing.expectEqualSlices(u8, "test", rsp.data());
_ = rsp.cdc();
try testing.expectEqualSlices(u8, "test", rsp.data());
}
Loading