github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 23:38:31 +00:00
Code Issues Projects Releases Wiki Activity

netlink: Fix invalid route crashes agent

Browse Source 
Invalid routes in update_routes request crash agent, fix it

Fixes: #73

Signed-off-by: Yang Bo <bo@hyper.sh>
This commit is contained in:
Yang Bo 2019-11-05 10:43:37 +08:00
parent d045169476
commit d33c2f84a8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/agent/src/netlink.rs
View File

@ -2437,6 +2437,9 @@ impl RtnlHandle {
for grpcroute in rt { for grpcroute in rt {
if grpcroute.gateway.as_str() == "" { if grpcroute.gateway.as_str() == "" {
let r = RtRoute::from(grpcroute.clone()); let r = RtRoute::from(grpcroute.clone());
if r.index == -1 {
continue;
}
self.add_one_route(&r)?; self.add_one_route(&r)?;
} }
} }
@ -2444,6 +2447,9 @@ impl RtnlHandle {
for grpcroute in rt { for grpcroute in rt {
if grpcroute.gateway.as_str() != "" { if grpcroute.gateway.as_str() != "" {
let r = RtRoute::from(grpcroute.clone()); let r = RtRoute::from(grpcroute.clone());
if r.index == -1 {
continue;
}
self.add_one_route(&r)?; self.add_one_route(&r)?;
} }
} }
@ -2754,7 +2760,10 @@ impl From<Route> for RtRoute {
let index = { let index = {
let mut rh = RtnlHandle::new(NETLINK_ROUTE, 0).unwrap(); let mut rh = RtnlHandle::new(NETLINK_ROUTE, 0).unwrap();
rh.find_link_by_name(r.device.as_str()).unwrap().ifi_index match rh.find_link_by_name(r.device.as_str()) {
Ok(ifi) => ifi.ifi_index,
Err(_) => -1,
}
}; };
let (dest, dst_len) = if r.dest.is_empty() { let (dest, dst_len) = if r.dest.is_empty() {