Skip to content
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

Jump to bottom

Add length checks during parsing #441

Merged
merged 1 commit into from
Aug 3, 2023
+48 −10
Merged

Add length checks during parsing #441

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
58 changes: 48 additions & 10 deletions lorawan/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ bitfield! {

impl MHDR {
pub fn read(reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
if reader.remaining() < size_of::<Self>() {
return Err(LoraWanError::InvalidPacketSize(
MType::Invalid(0),
reader.remaining(),
));
}
Ok(Self(reader.get_u8()))
}

Expand Down Expand Up @@ -237,9 +243,13 @@ impl fmt::Debug for Fhdr {
}

impl Fhdr {
pub fn read(direction: Direction, reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
pub fn read(
direction: Direction,
payload_type: MType,
reader: &mut dyn Buf,
) -> Result<Self, LoraWanError> {
let dev_addr = reader.get_u32_le();
let fctrl = FCtrl::read(direction, reader)?;
let fctrl = FCtrl::read(direction, payload_type, reader)?;
let fcnt = reader.get_u16_le();
let fopts = reader.copy_to_bytes(fctrl.fopts_len());
let res = Self {
Expand Down Expand Up @@ -277,7 +287,13 @@ bitfield! {
}

impl FCtrlUplink {
pub fn read(reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
pub fn read(payload_type: MType, reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
if reader.remaining() < size_of::<Self>() {
return Err(LoraWanError::InvalidPacketSize(
payload_type,
reader.remaining(),
));
}
Ok(Self(reader.get_u8()))
}

Expand All @@ -299,7 +315,13 @@ bitfield! {
}

impl FCtrlDownlink {
pub fn read(reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
pub fn read(payload_type: MType, reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
if reader.remaining() < size_of::<Self>() {
return Err(LoraWanError::InvalidPacketSize(
payload_type,
reader.remaining(),
));
}
Ok(Self(reader.get_u8()))
}

Expand All @@ -323,10 +345,14 @@ impl FCtrl {
}
}

pub fn read(direction: Direction, reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
pub fn read(
direction: Direction,
payload_type: MType,
reader: &mut dyn Buf,
) -> Result<Self, LoraWanError> {
let res = match direction {
Direction::Uplink => Self::Uplink(FCtrlUplink::read(reader)?),
Direction::Downlink => Self::Downlink(FCtrlDownlink::read(reader)?),
Direction::Uplink => Self::Uplink(FCtrlUplink::read(payload_type, reader)?),
Direction::Downlink => Self::Downlink(FCtrlDownlink::read(payload_type, reader)?),
};
Ok(res)
}
Expand All @@ -352,7 +378,7 @@ impl MACPayload {
direction: Direction,
reader: &mut dyn Buf,
) -> Result<Self, LoraWanError> {
let fhdr = Fhdr::read(direction, reader)?;
let fhdr = Fhdr::read(direction, payload_type, reader)?;
let data = reader.copy_to_bytes(reader.remaining());
let (fport, payload) = match data.split_first() {
Some((port, mut payload)) => (
Expand Down Expand Up @@ -459,7 +485,13 @@ impl fmt::Debug for JoinRequest {

impl JoinRequest {
pub fn read(reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
// TODO: Reader length check
if reader.remaining() < size_of::<Self>() {
return Err(LoraWanError::InvalidPacketSize(
MType::JoinRequest,
reader.remaining(),
));
}

let mut res = Self {
app_eui: reader.get_u64_le(),
dev_eui: reader.get_u64_le(),
Expand Down Expand Up @@ -489,7 +521,13 @@ pub struct JoinAccept {

impl JoinAccept {
pub fn read(reader: &mut dyn Buf) -> Result<Self, LoraWanError> {
// TODO: Reader length check
if reader.remaining() < size_of::<Self>() {
return Err(LoraWanError::InvalidPacketSize(
MType::JoinAccept,
reader.remaining(),
));
}

let mut app_nonce = [0u8; 3];
let mut net_id = [0u8; 3];
reader.copy_to_slice(&mut app_nonce);
Expand Down