Skip to content

Check NLA buffers on creation #129

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

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Check NLA buffers on creation #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cc57f7
Check NLA buffers on creation
Jeff-A-Martin Jul 18, 2024
8e68a45
Merge branch 'main' into check-nla-buffers
cathay4t Aug 12, 2024
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
18 changes: 12 additions & 6 deletions src/link/af_spec/unspec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,22 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
nlas.push(match nla.kind() {
k if k == u8::from(AddressFamily::Inet) as u16 => {
AfSpecUnspec::Inet(
VecAfSpecInet::parse(&NlaBuffer::new(&nla.value()))
.context(err)?
.0,
VecAfSpecInet::parse(
&NlaBuffer::new_checked(&nla.value())
.context(err)?,
)
.context(err)?
.0,
)
}
k if k == u8::from(AddressFamily::Inet6) as u16 => {
AfSpecUnspec::Inet6(
VecAfSpecInet6::parse(&NlaBuffer::new(&nla.value()))
.context(err)?
.0,
VecAfSpecInet6::parse(
&NlaBuffer::new_checked(&nla.value())
.context(err)?,
)
.context(err)?
.0,
)
}
kind => AfSpecUnspec::Other(DefaultNla::parse(&nla).context(
Expand Down
126 changes: 86 additions & 40 deletions src/link/attribute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,20 +373,41 @@ impl<'a, T: AsRef<[u8]> + ?Sized>
) -> Result<Self, DecodeError> {
let payload = buf.value();
Ok(match buf.kind() {
IFLA_VFINFO_LIST => Self::VfInfoList(
VecLinkVfInfo::parse(&NlaBuffer::new(payload))
.context(format!("invalid IFLA_VFINFO_LIST {payload:?}"))?
IFLA_VFINFO_LIST => {
let err =
|payload| format!("invalid IFLA_VFINFO_LIST {payload:?}");
Self::VfInfoList(
VecLinkVfInfo::parse(
&NlaBuffer::new_checked(payload)
.context(err(payload))?,
)
.context(err(payload))?
.0,
),
IFLA_VF_PORTS => Self::VfPorts(
VecLinkVfPort::parse(&NlaBuffer::new(payload))
.context(format!("invalid IFLA_VF_PORTS {payload:?}"))?
)
}
IFLA_VF_PORTS => {
let err =
|payload| format!("invalid IFLA_VF_PORTS {payload:?}");
Self::VfPorts(
VecLinkVfPort::parse(
&NlaBuffer::new_checked(payload)
.context(err(payload))?,
)
.context(err(payload))?
.0,
),
IFLA_PORT_SELF => Self::PortSelf(
LinkVfPort::parse(&NlaBuffer::new(payload))
.context(format!("invalid IFLA_PORT_SELF {payload:?}"))?,
),
)
}
IFLA_PORT_SELF => {
let err =
|payload| format!("invalid IFLA_PORT_SELF {payload:?}");
Self::PortSelf(
LinkVfPort::parse(
&NlaBuffer::new_checked(payload)
.context(err(payload))?,
)
.context(err(payload))?,
)
}
IFLA_PHYS_PORT_ID => {
Self::PhysPortId(LinkPhysId::parse(payload).context(
format!("invalid IFLA_PHYS_PORT_ID value {payload:?}"),
Expand All @@ -401,29 +422,37 @@ impl<'a, T: AsRef<[u8]> + ?Sized>
LinkWirelessEvent::parse(payload)
.context(format!("invalid IFLA_WIRELESS {payload:?}"))?,
),
IFLA_PROTINFO => match interface_family {
AddressFamily::Inet6 => Self::ProtoInfoInet6(
VecLinkProtoInfoInet6::parse(&NlaBuffer::new(payload))
.context(format!(
"invalid IFLA_PROTINFO for AF_INET6 {payload:?}"
))?
IFLA_PROTINFO => {
let err = |payload| {
format!("invalid IFLA_PROTINFO for AF_INET6 {payload:?}")
};
match interface_family {
AddressFamily::Inet6 => Self::ProtoInfoInet6(
VecLinkProtoInfoInet6::parse(
&NlaBuffer::new_checked(payload)
.context(err(payload))?,
)
.context(err(payload))?
.0,
),
#[cfg(any(target_os = "linux", target_os = "fuchsia",))]
AddressFamily::Bridge => Self::ProtoInfoBridge(
VecLinkProtoInfoBridge::parse(&NlaBuffer::new(payload))
),
#[cfg(any(target_os = "linux", target_os = "fuchsia",))]
AddressFamily::Bridge => Self::ProtoInfoBridge(
VecLinkProtoInfoBridge::parse(&NlaBuffer::new_checked(
payload,
)?)
.context(format!(
"invalid IFLA_PROTINFO for AF_INET6 {payload:?}"
))?
.0,
),
_ => Self::ProtoInfoUnknown(DefaultNla::parse(buf).context(
format!(
"invalid IFLA_PROTINFO for \
),
_ => Self::ProtoInfoUnknown(
DefaultNla::parse(buf).context(format!(
"invalid IFLA_PROTINFO for \
{interface_family:?}: {payload:?}"
))?,
),
)?),
},
}
}
IFLA_EVENT => Self::Event(
LinkEvent::parse(payload)
.context(format!("invalid IFLA_EVENT {payload:?}"))?,
Expand Down Expand Up @@ -604,24 +633,41 @@ impl<'a, T: AsRef<[u8]> + ?Sized>
)
}
IFLA_AF_SPEC => match interface_family {
AddressFamily::Unspec => Self::AfSpecUnspec(
VecAfSpecUnspec::parse(&NlaBuffer::new(&buf.value()))
.context("invalid IFLA_AF_SPEC value for AF_UNSPEC")?
AddressFamily::Unspec => {
let err = "invalid IFLA_AF_SPEC value for AF_UNSPEC";
Self::AfSpecUnspec(
VecAfSpecUnspec::parse(
&NlaBuffer::new_checked(&buf.value())
.context(err)?,
)
.context(err)?
.0,
),
)
}
#[cfg(any(target_os = "linux", target_os = "fuchsia",))]
AddressFamily::Bridge => Self::AfSpecBridge(
VecAfSpecBridge::parse(&NlaBuffer::new(&buf.value()))
.context("invalid IFLA_AF_SPEC value for AF_BRIDGE")?
AddressFamily::Bridge => {
let err = "invalid IFLA_AF_SPEC value for AF_BRIDGE";
Self::AfSpecBridge(
VecAfSpecBridge::parse(
&NlaBuffer::new_checked(&buf.value())
.context(err)?,
)
.context(err)?
.0,
),
)
}
_ => Self::AfSpecUnknown(payload.to_vec()),
},
IFLA_LINKINFO => Self::LinkInfo(
VecLinkInfo::parse(&NlaBuffer::new(&buf.value()))
.context("invalid IFLA_LINKINFO value")?
IFLA_LINKINFO => {
let err = "invalid IFLA_LINKINFO value";
Self::LinkInfo(
VecLinkInfo::parse(
&NlaBuffer::new_checked(&buf.value()).context(err)?,
)
.context(err)?
.0,
),
)
}
IFLA_XDP => {
let err = "invalid IFLA_XDP value";
let buf = NlaBuffer::new_checked(payload).context(err)?;
Expand Down
4 changes: 3 additions & 1 deletion src/link/sriov/vf_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
buf.value()
))?;
if nla.kind() == IFLA_VF_INFO {
nlas.push(LinkVfInfo::parse(&NlaBuffer::new(nla.value()))?);
nlas.push(LinkVfInfo::parse(&NlaBuffer::new_checked(
nla.value(),
)?)?);
} else {
log::warn!(
"BUG: Expecting IFLA_VF_INFO in IFLA_VFINFO_LIST, \
Expand Down
4 changes: 3 additions & 1 deletion src/link/sriov/vf_port.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
buf.value()
))?;
if nla.kind() == IFLA_VF_PORT {
nlas.push(LinkVfPort::parse(&NlaBuffer::new(nla.value()))?);
nlas.push(LinkVfPort::parse(&NlaBuffer::new_checked(
nla.value(),
)?)?);
} else {
log::warn!(
"BUG: Expecting IFLA_VF_PORT in IFLA_VF_PORTS, \
Expand Down
14 changes: 10 additions & 4 deletions src/neighbour_table/attribute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,17 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
)
.context(format!("invalid NDTA_STATS {payload:?}"))?,
),
NDTA_PARMS => Self::Parms(
VecNeighbourTableParameter::parse(&NlaBuffer::new(payload))
.context(format!("invalid NDTA_PARMS {payload:?}"))?
NDTA_PARMS => {
let err = |payload| format!("invalid NDTA_PARMS {payload:?}");
Self::Parms(
VecNeighbourTableParameter::parse(
&NlaBuffer::new_checked(payload)
.context(err(payload))?,
)
.context(err(payload))?
.0,
),
)
}
NDTA_GC_INTERVAL => Self::GcInterval(
parse_u64(payload).context("invalid NDTA_GC_INTERVAL value")?,
),
Expand Down