proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 21:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ss: do not emit warn while dumping MPTCP on old kernels

Browse Source 
Prior to this commit, running 'ss' on a kernel older than v5.9
bumps an error message:

RTNETLINK answers: Invalid argument

When asked to dump protocol number > 255 - that is: MPTCP - 'ss'
adds an INET_DIAG_REQ_PROTOCOL attribute, unsupported by the older
kernel.

Avoid the warning ignoring filter issues when INET_DIAG_REQ_PROTOCOL
is used.

Additionally older kernel end-up invoking tcpdiag_send(), which
in turn will try to dump DCCP socks. Bail early in such function,
as the kernel does not implement an MPTCPDIAG_GET request.

Reported-by: "Rantala, Tommi T. (Nokia - FI/Espoo)" <tommi.t.rantala@nokia.com>
Fixes: 9c3be2c0ee ("ss: mptcp: add msk diag interface support")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Paolo Abeni 2021-01-25 17:02:07 +01:00 committed by Stephen Hemminger
parent 4712a46174
commit 3d6d9e6e67
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/ss.c
View File

@ -3404,7 +3404,7 @@ static int tcpdiag_send(int fd, int protocol, struct filter *f)
struct iovec iov[3];
int iovlen = 1;
if (protocol == IPPROTO_UDP)
if (protocol == IPPROTO_UDP || protocol == IPPROTO_MPTCP)
return -1;
if (protocol == IPPROTO_TCP)
@ -3623,6 +3623,14 @@ static int inet_show_netlink(struct filter *f, FILE *dump_fp, int protocol)
if (preferred_family == PF_INET6)
family = PF_INET6;
/* extended protocol will use INET_DIAG_REQ_PROTOCOL,
* not supported by older kernels. On such kernel
* rtnl_dump will bail with rtnl_dump_error().
* Suppress the error to avoid confusing the user
*/
if (protocol > 255)
rth.flags |= RTNL_HANDLE_F_SUPPRESS_NLERR;
again:
if ((err = sockdiag_send(family, rth.fd, protocol, f)))
goto Exit;