ipmonitor: Fix recvmsg with ancillary data
Subsystems (3)
PATCH 1/1 ipmonitor: Fix recvmsg with ancillary data
A successful call to recvmsg() causes msg.msg_controllen to contain the length of the received ancillary data. However, the current code in the 'ip' utility doesn't reset this value after each recvmsg().
This means that if a call to recvmsg() doesn't have ancillary data, then 'msg.msg_controllen' will be set to 0, causing future recvmsg() which do contain ancillary data to get MSG_CTRUNC set in msg.msg_flags.
This fixes 'ip monitor' running with the all-nsid option - With this option the kernel passes the nsid as ancillary data. If while 'ip monitor' is running an even on the current netns is received, then no ancillary data will be sent, causing 'msg.msg_controllen' to be set to 0, which causes 'ip monitor' to indefinitely print "[nsid current]" instead of the real nsid.
--- lib/libnetlink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
lib/libnetlink.c +5 -5
@@ -1138,16 +1138,16 @@ int rtnl_listen(struct rtnl_handle *rtnl,char buf[16384 ];char cmsgbuf[BUFSIZ ]; -if (rtnl->flags &RTNL_HANDLE_F_LISTEN_ALL_NSID ) { - msg.msg_control = &cmsgbuf; - msg.msg_controllen =sizeof (cmsgbuf); - } - iov.iov_base = buf;while (1 ) {struct rtnl_ctrl_data ctrl;struct cmsghdr *cmsg; +if (rtnl->flags &RTNL_HANDLE_F_LISTEN_ALL_NSID ) { + msg.msg_control = &cmsgbuf; + msg.msg_controllen =sizeof (cmsgbuf); + } + iov.iov_len =sizeof (buf); status =recvmsg (rtnl->fd, &msg,0 );
Signature · 1 line
2.17.1
Le 15/07/2021 à 16:38, Lahav Schlesinger a écrit :
Quoted 14 lines
A successful call to
recvmsg()causes msg.msg_controllen to contain the length of the received ancillary data. However, the current code in the 'ip' utility doesn't reset this value after eachrecvmsg().This means that if a call to
recvmsg()doesn't have ancillary data, then 'msg.msg_controllen' will be set to 0, causing futurerecvmsg()which do contain ancillary data to getMSG_CTRUNCset in msg.msg_flags.This fixes 'ip monitor' running with the all-nsid option - With this option the kernel passes the nsid as ancillary data. If while 'ip monitor' is running an even on the current netns is received, then no ancillary data will be sent, causing 'msg.msg_controllen' to be set to 0, which causes 'ip monitor' to indefinitely print "[nsid current]" instead of the real nsid.
Quoted 3 lines
Fixes 449b824ad196 ("ipmonitor: allows to monitor in several netns")Cc Nicolas Dichtel <[email protected]>Signed-off-by Lahav Schlesinger <[email protected]>